From: John W. Linville Date: Wed, 29 Feb 2012 20:08:33 +0000 (-0500) Subject: carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly" X-Git-Tag: v3.4-rc1~177^2~108^2~204 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c288ec614e264b46853c65d3db9ccf91d53c9484;p=profile%2Fivi%2Fkernel-x86-ivi.git carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly" That commit intended for 3.4 renamed IEEE80211_TX_CTL_POLL_RESPONSE as IEEE80211_TX_CTL_NO_PS_BUFFER. Meanwhile, "carl9170: fix frame delivery if sta is in powersave mode" added a reference to IEEE80211_TX_CTL_POLL_RESPONSE in the fixes stream for 3.3. This simple patch fixes that merge boo-boo. Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c index 0f00721..aed3051 100644 --- a/drivers/net/wireless/ath/carl9170/tx.c +++ b/drivers/net/wireless/ath/carl9170/tx.c @@ -1247,7 +1247,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb) tx_info = IEEE80211_SKB_CB(skb); if (unlikely(sta_info->sleeping) && - !(tx_info->flags & (IEEE80211_TX_CTL_POLL_RESPONSE | + !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER | IEEE80211_TX_CTL_CLEAR_PS_FILT))) { rcu_read_unlock();