34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
|
||
|
|
Date: Fri, 2 Nov 2018 21:49:57 +0100
|
||
|
|
Subject: [PATCH] ath9k: dynack: check da->enabled first in sampling
|
||
|
|
routines
|
||
|
|
|
||
|
|
Check da->enabled flag first in ath_dynack_sample_tx_ts and
|
||
|
|
ath_dynack_sample_ack_ts routines in order to avoid useless
|
||
|
|
processing
|
||
|
|
|
||
|
|
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
|
||
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/dynack.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/dynack.c
|
||
|
|
@@ -178,7 +178,7 @@ void ath_dynack_sample_tx_ts(struct ath_
|
||
|
|
u32 dur = ts->duration;
|
||
|
|
u8 ridx;
|
||
|
|
|
||
|
|
- if ((info->flags & IEEE80211_TX_CTL_NO_ACK) || !da->enabled)
|
||
|
|
+ if (!da->enabled || (info->flags & IEEE80211_TX_CTL_NO_ACK))
|
||
|
|
return;
|
||
|
|
|
||
|
|
spin_lock_bh(&da->qlock);
|
||
|
|
@@ -251,7 +251,7 @@ void ath_dynack_sample_ack_ts(struct ath
|
||
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
||
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
|
||
|
|
|
||
|
|
- if (!ath_dynack_bssidmask(ah, hdr->addr1) || !da->enabled)
|
||
|
|
+ if (!da->enabled || !ath_dynack_bssidmask(ah, hdr->addr1))
|
||
|
|
return;
|
||
|
|
|
||
|
|
spin_lock_bh(&da->qlock);
|