2013-03-28 15:29:41

by Johannes Berg

[permalink] [raw]

Subject: pull-request: mac80211 2013-03-28

---

John,

Before I disappear for Easter vacation, I decided to send you two more
mac80211 fixes.

I had changed the idle handling to simplify it, but broken the
sequencing of commands, at least for ath9k-htc, one patch restores the
sequence. The other patch fixes a crash Jouni found while stress-testing
the remain-on-channel code, when an item is deleted the work struct can
run twice and crash the second time.

Please pull. Thanks,
johannes


The following changes since commit 370bd005937c0e00f9104a602f9fe1dd6b21b54b:

mac80211: Don't restart sta-timer if not associated. (2013-03-24 11:15:59 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git for-john

for you to fetch changes up to 382a103b2b528a3085cde4ac56fc69d92a828b72:

mac80211: fix idle handling sequence (2013-03-25 16:50:18 +0100)

----------------------------------------------------------------
Johannes Berg (2):
mac80211: fix remain-on-channel cancel crash
mac80211: fix idle handling sequence

net/mac80211/cfg.c | 6 ++++--
net/mac80211/chan.c | 17 ++++++++++++++---
net/mac80211/ieee80211_i.h | 4 +++-
net/mac80211/iface.c | 2 +-
net/mac80211/offchannel.c | 23 +++++++++++++++++------
5 files changed, 39 insertions(+), 13 deletions(-)

---

Attachments:

signature.asc (801.00 B)
This is a digitally signed message part

2013-04-01 19:15:52

by John W. Linville

[permalink] [raw]

Subject: Re: pull-request: mac80211 2013-03-28

---

On Thu, Mar 28, 2013 at 04:29:33PM +0100, Johannes Berg wrote:
> John,
>
> Before I disappear for Easter vacation, I decided to send you two more
> mac80211 fixes.
>
> I had changed the idle handling to simplify it, but broken the
> sequencing of commands, at least for ath9k-htc, one patch restores the
> sequence. The other patch fixes a crash Jouni found while stress-testing
> the remain-on-channel code, when an item is deleted the work struct can
> run twice and crash the second time.
>
> Please pull. Thanks,
> johannes
>
>
> The following changes since commit 370bd005937c0e00f9104a602f9fe1dd6b21b54b:
>
> mac80211: Don't restart sta-timer if not associated. (2013-03-24 11:15:59 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git for-john
>
> for you to fetch changes up to 382a103b2b528a3085cde4ac56fc69d92a828b72:
>
> mac80211: fix idle handling sequence (2013-03-25 16:50:18 +0100)

Pulling now...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.