From patchwork Tue Oct 20 06:41:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: manikanta.pubbisetty@gmail.com X-Patchwork-Id: 7449871 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 469129F302 for ; Tue, 20 Oct 2015 19:12:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 71EC6206F3 for ; Tue, 20 Oct 2015 19:11:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 842C7204C9 for ; Tue, 20 Oct 2015 19:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751695AbbJTTL5 (ORCPT ); Tue, 20 Oct 2015 15:11:57 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:34609 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751228AbbJTTL4 (ORCPT ); Tue, 20 Oct 2015 15:11:56 -0400 Received: by padhk11 with SMTP id hk11so29541012pad.1 for ; Tue, 20 Oct 2015 12:11:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=eKW2Ld51v2J2WD3nnqpeWaxnN32mXxyYZQvr58OK0rc=; b=OSbn4OVqke7pdzhsJiyDTk27wTk5kkFnUZr/qMIfscGD/RBjhxaGDRaPAceeWAalj6 jHoMO1Vk8QCmydIrDEgeCpDPRV0j4l1ecv+fjE6wfpY7TJ3KZDUNEV96XdvqWFlNMOf9 4O/RNpBzevMUCsBKKg3/9hplD4ns4720HYxeuoPFbYRC6q0Pq0QEsqzsgZ/mZrmcU0hS xQ7kuPf3YJdqTqshQg7xLccFdNZ0wj2tWC5hu+PCBTsB56+tB2iRJXt5RT+ptziDjwtp bljevBQQxWy6768TM6NC3HqkgJwK14mjDRWpd2L9VwADVZEyzv9odl21cfgWKo3NktNI wvxQ== X-Received: by 10.68.129.231 with SMTP id nz7mr5649367pbb.53.1445368316033; Tue, 20 Oct 2015 12:11:56 -0700 (PDT) Received: from localhost ([106.51.23.91]) by smtp.gmail.com with ESMTPSA id cw5sm5106247pbb.49.2015.10.20.12.11.54 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 20 Oct 2015 12:11:55 -0700 (PDT) From: manikanta.pubbisetty@gmail.com To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Manikanta Pubbisetty Subject: [PATCHv2] ath10k: consolidate if statements in ath10k_wmi_event_mgmt_rx Date: Tue, 20 Oct 2015 12:11:40 +0530 Message-Id: <1445323300-17431-1-git-send-email-manikanta.pubbisetty@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, DATE_IN_PAST_12_24, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Manikanta Pubbisetty This patch replaces mutliple if conditional checks with a single if condition in WMI management rx handler. Found during code review. Signed-off-by: Manikanta Pubbisetty --- v2: 1) Changed commit log 2) removed compilation error drivers/net/wireless/ath/ath10k/wmi.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 6e7d7a7..551e4b63 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -2200,22 +2200,9 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) ath10k_dbg(ar, ATH10K_DBG_MGMT, "event mgmt rx status %08x\n", rx_status); - if (test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags)) { - dev_kfree_skb(skb); - return 0; - } - - if (rx_status & WMI_RX_STATUS_ERR_DECRYPT) { - dev_kfree_skb(skb); - return 0; - } - - if (rx_status & WMI_RX_STATUS_ERR_KEY_CACHE_MISS) { - dev_kfree_skb(skb); - return 0; - } - - if (rx_status & WMI_RX_STATUS_ERR_CRC) { + if ((test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags)) || + (rx_status & (WMI_RX_STATUS_ERR_DECRYPT | + WMI_RX_STATUS_ERR_KEY_CACHE_MISS | WMI_RX_STATUS_ERR_CRC))) { dev_kfree_skb(skb); return 0; }