* [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"
@ 2012-02-29 20:11 John W. Linville
2012-02-29 20:22 ` Johannes Berg
0 siblings, 1 reply; 4+ messages in thread
From: John W. Linville @ 2012-02-29 20:11 UTC (permalink / raw)
To: linux-wireless; +Cc: John W. Linville
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>
---
drivers/net/wireless/ath/carl9170/tx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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();
--
1.7.4.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"
2012-02-29 20:11 [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly" John W. Linville
@ 2012-02-29 20:22 ` Johannes Berg
2012-02-29 20:27 ` Christian Lamparter
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2012-02-29 20:22 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
On Wed, 2012-02-29 at 15:11 -0500, John W. Linville wrote:
> 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.
Thanks, sorry about the overlap.
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"
2012-02-29 20:22 ` Johannes Berg
@ 2012-02-29 20:27 ` Christian Lamparter
2012-02-29 20:35 ` John W. Linville
0 siblings, 1 reply; 4+ messages in thread
From: Christian Lamparter @ 2012-02-29 20:27 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, linux-wireless
On Wednesday, February 29, 2012 09:22:03 PM Johannes Berg wrote:
> On Wed, 2012-02-29 at 15:11 -0500, John W. Linville wrote:
> > 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.
>
> Thanks, sorry about the overlap.
Err?! I wrote and posted an updated patch on saturday.
[PATCH -wt] carl9170: fix frame delivery if sta is in powersave mode
http://www.spinics.net/lists/linux-wireless/msg85556.html
Regards,
Chr
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"
2012-02-29 20:27 ` Christian Lamparter
@ 2012-02-29 20:35 ` John W. Linville
0 siblings, 0 replies; 4+ messages in thread
From: John W. Linville @ 2012-02-29 20:35 UTC (permalink / raw)
To: Christian Lamparter; +Cc: Johannes Berg, linux-wireless
On Wed, Feb 29, 2012 at 09:27:18PM +0100, Christian Lamparter wrote:
> On Wednesday, February 29, 2012 09:22:03 PM Johannes Berg wrote:
> > On Wed, 2012-02-29 at 15:11 -0500, John W. Linville wrote:
> > > 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.
> >
> > Thanks, sorry about the overlap.
> Err?! I wrote and posted an updated patch on saturday.
>
> [PATCH -wt] carl9170: fix frame delivery if sta is in powersave mode
> http://www.spinics.net/lists/linux-wireless/msg85556.html
Indeed, you did. I think the net effect is the same, right?
I generally prefer to merge a single fix patch and account for any
conflicts in a merge. This one slipped through because of the lack
of direct merge breakage. Anyway, it all seems fine now.
Thanks,
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-29 20:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-29 20:11 [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly" John W. Linville
2012-02-29 20:22 ` Johannes Berg
2012-02-29 20:27 ` Christian Lamparter
2012-02-29 20:35 ` John W. Linville
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).