mbox

pull request: wireless 2014-05-08

Message ID 20140508152516.GC6180@tuxdriver.com
State Accepted, archived
Delegated to: David Miller
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem

Message

John W. Linville May 8, 2014, 3:25 p.m. UTC
Dave,

This one is all from Johannes:

"Here are a few small fixes for the current cycle: radiotap TX flags were
wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces,
Eliad fixes a locking bug and a cfg80211 state problem and finally
Henning sent me a fix for IBSS rate information."

Please let me know if there are problems!

Thanks,

John

---

The following changes since commit 23a456f05353035d1a2b3f1b9a92707acdc036e0:

  net: mdio: of_mdiobus_register(): fall back to mdiobus_register() for !CONFIG_OF (2014-05-07 17:16:35 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem

for you to fetch changes up to 6153871f77f8fa778cd0cf1e2979db75e25d3532:

  Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2014-05-08 11:13:41 -0400)

----------------------------------------------------------------

Bob Copeland (1):
      mac80211: fixup radiotap tx flags for RTS/CTS

Chun-Yeow Yeoh (1):
      mac80211: avoid handling of SMPS for mesh

Eliad Peller (3):
      cfg80211: free sme on connection failures
      cfg80211: add cfg80211_sched_scan_stopped_rtnl
      mac80211: fix nested rtnl locking on ieee80211_reconfig

Henning Rogge (1):
      mac80211: Fix mac80211 station info rx bitrate for IBSS mode

John W. Linville (2):
      Merge git://git.kernel.org/.../jberg/mac80211
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem

 include/net/cfg80211.h  | 12 ++++++++++++
 net/mac80211/rx.c       |  3 ++-
 net/mac80211/sta_info.c |  3 ++-
 net/mac80211/status.c   |  5 ++---
 net/mac80211/util.c     |  2 +-
 net/wireless/scan.c     | 12 ++++++++++--
 net/wireless/sme.c      |  2 +-
 7 files changed, 30 insertions(+), 9 deletions(-)

Comments

David Miller May 9, 2014, 8:47 p.m. UTC | #1
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 8 May 2014 11:25:17 -0400

> This one is all from Johannes:
> 
> "Here are a few small fixes for the current cycle: radiotap TX flags were
> wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces,
> Eliad fixes a locking bug and a cfg80211 state problem and finally
> Henning sent me a fix for IBSS rate information."
> 
> Please let me know if there are problems!

Pulled, thanks John.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html