pull request: mac80211-next-csa 2014-03-24

pull request: mac80211-next-csa 2014-03-24

[Luca Coelho]

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

Hi Johannes,

As we agreed, I'm sending you a pull request with the channel-switch
stuff Michał and I have been working on.

This includes my combination and reservation patchsets and the VLAN copy
chanctx from Michał that my reservation patchset depends on.

Please pull.

The following changes since commit 73fb08e24ae840bc518facc2c605dd6bb3751fec:

  cfg80211: remove macro ASSERT_RDEV_LOCK(rdev) (2014-03-19 21:29:58 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/luca/mac80211-next-csa.git for-johannes

for you to fetch changes up to 5824e703a7a1dbd766aa445fff8518ddf90468be:

  mac80211: allow reservation of a running chanctx (2014-03-24 10:18:32 +0200)

----------------------------------------------------------------
Luciano Coelho (9):
      cfg80211: refactor cfg80211_can_use_iftype_chan()
      cfg80211/mac80211: refactor cfg80211_chandef_dfs_required()
      cfg80211/mac80211: move interface counting for combination check to mac80211
      cfg80211/mac80211: move combination check to mac80211 for ibss
      cfg80211/mac80211: move more combination checks to mac80211
      mac80211: split ieee80211_vif_change_channel in two
      mac80211: refactor ieee80211_assign/unassign_vif_chanctx into one
      mac80211: implement chanctx reservation
      mac80211: allow reservation of a running chanctx

Michal Kazior (1):
      mac80211: protect AP VLAN list with local->mtx

 Documentation/DocBook/80211.tmpl |   1 +
 include/net/cfg80211.h           |  31 ++++++-
 include/net/mac80211.h           |   7 ++
 net/mac80211/cfg.c               |  16 +++-
 net/mac80211/chan.c              | 384 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
 net/mac80211/ibss.c              |  64 +++++++++----
 net/mac80211/ieee80211_i.h       |  21 ++++-
 net/mac80211/iface.c             |  15 ++-
 net/mac80211/mesh.c              |   9 +-
 net/mac80211/util.c              |  76 +++++++++++++++
 net/wireless/chan.c              |  74 +++++++++++----
 net/wireless/core.c              |  11 +--
 net/wireless/core.h              |  29 ------
 net/wireless/ibss.c              |  24 -----
 net/wireless/mesh.c              |  25 -----
 net/wireless/mlme.c              |  14 +--
 net/wireless/nl80211.c           |  59 ++++--------
 net/wireless/util.c              | 139 ++++++++++++++++------------
 18 files changed, 651 insertions(+), 348 deletions(-)


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

Re: pull request: mac80211-next-csa 2014-03-24

[Johannes Berg]

On Mon, 2014-03-24 at 10:37 +0200, Luca Coelho wrote:
> Hi Johannes,
> 
> As we agreed, I'm sending you a pull request with the channel-switch
> stuff Michał and I have been working on.
> 
> This includes my combination and reservation patchsets and the VLAN copy
> chanctx from Michał that my reservation patchset depends on.

I've cherry-picked the patches to resolve some conflicts in the patches
themselves rather than in the merge, since I'll likely need to rebase
after the merge window.

johannes