Commit c288ec61 authored Feb 29, 2012 by John W. Linville

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 <linville@tuxdriver.com>

parent 8701ff0a

drivers/net/wireless/ath/carl9170/tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();