From: "John W. Linville" <linville@tuxdriver.com>
To: Christian Lamparter <chunkeey@googlemail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>,
linux-wireless@vger.kernel.org
Subject: Re: [PATCH] carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly"
Date: Wed, 29 Feb 2012 15:35:15 -0500 [thread overview]
Message-ID: <20120229203515.GE13733@tuxdriver.com> (raw)
In-Reply-To: <201202292127.18915.chunkeey@googlemail.com>
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.
prev parent reply other threads:[~2012-02-29 20:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120229203515.GE13733@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=chunkeey@googlemail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).