Hi John,
Coming back after a week of many meetings, I have a set of fixes for the
3.9 series.
I have two tracing fixes (one from Vladimir), two fixes for P2P device
crashes and a fix for a BSS memory leak/lost update problem.
Let me know if there's any problem.
johannes
The following changes since commit 801d929ca7d935ee199fd61d8ef914f51e892270:
mac80211: another fix for idle handling in monitor mode (2013-03-02 21:24:42 +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 c831bbaef890c0c739f9409f4a2cccb126da7e7a:
cfg80211: fix wdev tracing crash (2013-03-19 20:26:57 +0100)
----------------------------------------------------------------
Johannes Berg (5):
mac80211: always synchronize_net() during station removal
cfg80211: fix potential BSS memory leak and update
mac80211: fix crash with P2P Device returning action frames
cfg80211: always check for scan end on P2P device
cfg80211: fix wdev tracing crash
Vladimir Kondratiev (1):
cfg80211: fix inconsistency in trace for rdev_set_mac_acl
net/mac80211/rx.c | 14 +++++++++++++-
net/mac80211/sta_info.c | 12 ++++++++++--
net/wireless/core.c | 49 +++++++++++++++++++++++++++++++++++++------------
net/wireless/core.h | 3 +++
net/wireless/nl80211.c | 17 ++---------------
net/wireless/scan.c | 22 ++++++++++++++--------
net/wireless/trace.h | 5 +++--
7 files changed, 82 insertions(+), 40 deletions(-)
*sigh*
Testing found another issue. I'm not going to resend this, just give you
a new commit ID.
> I have two tracing fixes (one from Vladimir), two fixes for P2P device
> crashes, a fix for a BSS memory leak/lost update problem and a fix from
> Ben for a scanning issue in mac80211. It's a little on the large side
> because one of the P2P device problems required a bit much locking work,
> but I've run through all the different scenarios (wext/nl80211,
> p2p-device/station interface, ifdown/rfkill) to verify locking with
> lockdep.
> The following changes since commit 801d929ca7d935ee199fd61d8ef914f51e892270:
>
> mac80211: another fix for idle handling in monitor mode (2013-03-02 21:24:42 +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 9e68a67a888d98bda8393c29dde12fb4f0b42a19:
Really 370bd005937c0e00f9104a602f9fe1dd6b21b54b now.
johannes
> mac80211: Don't restart sta-timer if not associated. (2013-03-22 10:55:55 +0100)
>
> ----------------------------------------------------------------
> Ben Greear (1):
> mac80211: Don't restart sta-timer if not associated.
>
> Johannes Berg (6):
> mac80211: always synchronize_net() during station removal
> cfg80211: fix potential BSS memory leak and update
> mac80211: fix crash with P2P Device returning action frames
> cfg80211: fix wdev tracing crash
> mac80211: fix virtual monitor interface locking
> cfg80211: always check for scan end on P2P device
>
> Vladimir Kondratiev (1):
> cfg80211: fix inconsistency in trace for rdev_set_mac_acl
>
> net/mac80211/iface.c | 35 ++++++++++++++++--------------
> net/mac80211/mesh.c | 3 ++-
> net/mac80211/mlme.c | 6 ++++--
> net/mac80211/rx.c | 14 +++++++++++-
> net/mac80211/sta_info.c | 12 +++++++++--
> net/wireless/core.c | 57 ++++++++++++++++++++++++++++++++++++-------------
> net/wireless/core.h | 3 +++
> net/wireless/nl80211.c | 52 ++++++++++++++++++++++----------------------
> net/wireless/scan.c | 24 ++++++++++++++-------
> net/wireless/sme.c | 6 ++++--
> net/wireless/trace.h | 5 +++--
> net/wireless/wext-sme.c | 6 ++++++
> 12 files changed, 149 insertions(+), 74 deletions(-)
>
On Tue, 2013-03-19 at 20:57 +0100, Johannes Berg wrote:
> cfg80211: always check for scan end on P2P device
Ugh, consider this withdrawn. I hadn't tested with lockdep and didn't
notice the locking issue this introduces :(
johannes
On Sun, Mar 24, 2013 at 11:21:20AM +0100, Johannes Berg wrote:
> *sigh*
>
>
> Testing found another issue. I'm not going to resend this, just give you
> a new commit ID.
>
> > I have two tracing fixes (one from Vladimir), two fixes for P2P device
> > crashes, a fix for a BSS memory leak/lost update problem and a fix from
> > Ben for a scanning issue in mac80211. It's a little on the large side
> > because one of the P2P device problems required a bit much locking work,
> > but I've run through all the different scenarios (wext/nl80211,
> > p2p-device/station interface, ifdown/rfkill) to verify locking with
> > lockdep.
>
>
>
> > The following changes since commit 801d929ca7d935ee199fd61d8ef914f51e892270:
> >
> > mac80211: another fix for idle handling in monitor mode (2013-03-02 21:24:42 +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 9e68a67a888d98bda8393c29dde12fb4f0b42a19:
>
> Really 370bd005937c0e00f9104a602f9fe1dd6b21b54b now.
Pulling now (before you repost again!)...
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
Hi John,
Now I'm reviving this pull-request :-)
I have two tracing fixes (one from Vladimir), two fixes for P2P device
crashes, a fix for a BSS memory leak/lost update problem and a fix from
Ben for a scanning issue in mac80211. It's a little on the large side
because one of the P2P device problems required a bit much locking work,
but I've run through all the different scenarios (wext/nl80211,
p2p-device/station interface, ifdown/rfkill) to verify locking with
lockdep.
Let me know if there's any problem.
johannes
The following changes since commit 801d929ca7d935ee199fd61d8ef914f51e892270:
mac80211: another fix for idle handling in monitor mode (2013-03-02 21:24:42 +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 9e68a67a888d98bda8393c29dde12fb4f0b42a19:
mac80211: Don't restart sta-timer if not associated. (2013-03-22 10:55:55 +0100)
----------------------------------------------------------------
Ben Greear (1):
mac80211: Don't restart sta-timer if not associated.
Johannes Berg (6):
mac80211: always synchronize_net() during station removal
cfg80211: fix potential BSS memory leak and update
mac80211: fix crash with P2P Device returning action frames
cfg80211: fix wdev tracing crash
mac80211: fix virtual monitor interface locking
cfg80211: always check for scan end on P2P device
Vladimir Kondratiev (1):
cfg80211: fix inconsistency in trace for rdev_set_mac_acl
net/mac80211/iface.c | 35 ++++++++++++++++--------------
net/mac80211/mesh.c | 3 ++-
net/mac80211/mlme.c | 6 ++++--
net/mac80211/rx.c | 14 +++++++++++-
net/mac80211/sta_info.c | 12 +++++++++--
net/wireless/core.c | 57 ++++++++++++++++++++++++++++++++++++-------------
net/wireless/core.h | 3 +++
net/wireless/nl80211.c | 52 ++++++++++++++++++++++----------------------
net/wireless/scan.c | 24 ++++++++++++++-------
net/wireless/sme.c | 6 ++++--
net/wireless/trace.h | 5 +++--
net/wireless/wext-sme.c | 6 ++++++
12 files changed, 149 insertions(+), 74 deletions(-)