From d5590b9899e2b94170213959346de0430aab3be9 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 29 Feb 2012 15:08:33 -0500
Subject: [PATCH] --- yaml --- r: 290778 b: refs/heads/master c:
 c288ec614e264b46853c65d3db9ccf91d53c9484 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/tx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f1e7f2fa004..c49e64ed026d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8701ff0a88bcfc8c7dced3842919ad8d016a6835
+refs/heads/master: c288ec614e264b46853c65d3db9ccf91d53c9484
diff --git a/trunk/drivers/net/wireless/ath/carl9170/tx.c b/trunk/drivers/net/wireless/ath/carl9170/tx.c
index 0f00721995ef..aed305177af6 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/tx.c
+++ b/trunk/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();