diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-01-04 11:37:30 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-04 11:37:30 -0500 |
commit | d8f46ff11081f03b09efe82245a3257bab6bf60e (patch) | |
tree | fe47a5fe5ef62920ee3e1ffe5a2fd7a29918c6b0 /drivers/net/wireless/ath | |
parent | 405cc2736527bd506fd8f652308b03b2c8a1e8b9 (diff) | |
parent | b015dbc0f95eef34819515bd403a62569bca23df (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index d2348a5a780..a9c5ae75277 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1843,6 +1843,9 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw, struct ath_softc *sc = hw->priv; struct ath_node *an = (struct ath_node *) sta->drv_priv; + if (!(sc->sc_flags & SC_OP_TXAGGR)) + return; + switch (cmd) { case STA_NOTIFY_SLEEP: an->sleeping = true; |