]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ath10k: consolidate if statements in ath10k_wmi_event_mgmt_rx
authorManikanta Pubbisetty <manikanta.pubbisetty@gmail.com>
Tue, 20 Oct 2015 06:41:40 +0000 (12:11 +0530)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 4 Nov 2015 17:28:24 +0000 (19:28 +0200)
This patch replaces multiple if conditional checks with a single if condition
in WMI management rx handler. Found during code review.

Signed-off-by: Manikanta Pubbisetty <manikanta.pubbisetty@gmail.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/wmi.c

index 7569db0f69b5eed8f69d65c3e881f56bf54129b4..9e93ba3e916f1105543d644e8dd9a7a97afb990d 100644 (file)
@@ -2204,22 +2204,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;
        }