pull-request: mac80211-next 2012-07-05

pull-request: mac80211-next 2012-07-05

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1899 bytes --]

John,

Please pull these changes. The most important thing is the locking
regression (deadlock) fix for one of Michal's recent patches.

I have a pending fix for the queue-related crash Larry reported, but I'm
waiting for him to test it again. If you haven't pulled by then, I'll
update this pull request to include that (and the hwsim test I used.)

Thanks!

johannes

----
The following changes since commit ba0afa2f22e1e3f332e45460f99328025d44564e:

  mac80211: include VHT capability IE in probe requests (2012-07-02 15:13:09 +0200)

are available in the git repository at:

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

for you to fetch changes up to c5a7e582490c423f0685e42ee5cfb7c6de81adb0:

  cfg80211: fix locking regression in monitor channel tracking (2012-07-04 13:30:23 +0200)

----------------------------------------------------------------
Johannes Berg (4):
      mac80211: remove tx_frags driver callback
      mac80211_hwsim: fix NUM_BANDS usage
      mac80211: add TX prepare API
      cfg80211: fix locking regression in monitor channel tracking

Thomas Huehn (1):
      mac80211: reduce IEEE80211_TX_MAX_RATES

 drivers/net/wireless/ath/carl9170/tx.c |    6 ++---
 drivers/net/wireless/mac80211_hwsim.c  |    4 ++--
 drivers/net/wireless/p54/txrx.c        |    6 ++---
 include/net/mac80211.h                 |   38 ++++++++++++++++----------------
 net/mac80211/driver-ops.h              |   22 +++++++++++-------
 net/mac80211/main.c                    |    2 +-
 net/mac80211/mlme.c                    |    8 +++++++
 net/mac80211/trace.h                   |    7 ++++++
 net/mac80211/tx.c                      |   10 +++------
 net/wireless/core.c                    |    8 ++-----
 net/wireless/core.h                    |    4 +++-
 11 files changed, 65 insertions(+), 50 deletions(-)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

pull-request: mac80211-next 2012-07-06

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 2919 bytes --]

John,

> Please pull these changes. The most important thing is the locking
> regression (deadlock) fix for one of Michal's recent patches.
> 
> I have a pending fix for the queue-related crash Larry reported, but I'm
> waiting for him to test it again. If you haven't pulled by then, I'll
> update this pull request to include that (and the hwsim test I used.)

Here's the promised update, I additionally have the fix, 60 GHz bitrate
support, Eliad's patch that he had erroneously labelled for 3.5 and the
debugfs symlink fix.

kernel.org doesn't seem to have sync'ed yet as I just pushed so you may
have to pull from the master server via ssh, or wait a little bit.

Thanks,
johannes


------

The following changes since commit ba0afa2f22e1e3f332e45460f99328025d44564e:

  mac80211: include VHT capability IE in probe requests (2012-07-02 15:13:09 +0200)

are available in the git repository at:

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

for you to fetch changes up to 4d6d0ae2a088e1e054ef6d96ceb1b41523291e71:

  mac80211_hwsim: add testmode code to stop/wake queues (2012-07-06 15:27:15 +0200)

----------------------------------------------------------------
Eliad Peller (1):
      mac80211: always set in_reconfig=false on wakeup

Johannes Berg (7):
      mac80211: remove tx_frags driver callback
      mac80211_hwsim: fix NUM_BANDS usage
      mac80211: add TX prepare API
      cfg80211: fix locking regression in monitor channel tracking
      mac80211: fix debugfs default key links
      mac80211: fix crash with single-queue drivers
      mac80211_hwsim: add testmode code to stop/wake queues

Thomas Huehn (1):
      mac80211: reduce IEEE80211_TX_MAX_RATES

Vladimir Kondratiev (2):
      {nl,cfg}80211: support high bitrates
      cfg80211: bitrate calculation for 60g

 drivers/net/wireless/ath/carl9170/tx.c |    6 ++--
 drivers/net/wireless/mac80211_hwsim.c  |   12 ++++++--
 drivers/net/wireless/p54/txrx.c        |    6 ++--
 include/linux/nl80211.h                |    9 ++++++
 include/net/cfg80211.h                 |    4 ++-
 include/net/mac80211.h                 |   38 ++++++++++++------------
 net/mac80211/debugfs_key.c             |   16 ++++++----
 net/mac80211/driver-ops.h              |   22 +++++++++-----
 net/mac80211/main.c                    |    2 +-
 net/mac80211/mlme.c                    |    8 +++++
 net/mac80211/trace.h                   |    7 +++++
 net/mac80211/tx.c                      |   10 ++-----
 net/mac80211/util.c                    |   14 +++++++--
 net/wireless/core.c                    |    8 ++---
 net/wireless/core.h                    |    4 ++-
 net/wireless/nl80211.c                 |    9 ++++--
 net/wireless/util.c                    |   51 +++++++++++++++++++++++++++++++-
 17 files changed, 163 insertions(+), 63 deletions(-)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]