pull-request: mac80211 2014-08-29

pull-request: mac80211 2014-08-29

[Johannes Berg]

John,

Please excuse how late I'm sending this. Hopefully it can still go in.

Note that the tag is signed :)

johannes


The following changes since commit c9d26423e56ce1ab4d786f92aebecf859d419293:

  Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2014-08-14 18:13:46 -0600)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-john-2014-08-29

for you to fetch changes up to 14b058bbce9279ee432f0944ca14df69f4a0d170:

  mac80211: fix agg_status debugfs file alignment (2014-08-26 11:13:37 +0200)

----------------------------------------------------------------
Here are a few fixes for mac80211. One has been discussed for a while
and adds a terminating NUL-byte to the alpha2 sent to userspace, which
shouldn't be necessary but since many places treat it as a string we
couldn't move to just sending two bytes.

In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
fix for the recently introduced RX aggregation offload, a revert for
a broken patch (that luckily didn't really cause any harm) and a small
fix for alignment in debugfs.

----------------------------------------------------------------
Bob Copeland (1):
      mac80211: mesh_plink: handle confirm frames with new plid

Denton Gentry (1):
      mac80211: fix start_seq_num in Rx reorder offload

Eliad Peller (1):
      regulatory: add NUL to alpha2

Felix Fietkau (2):
      mac80211: ignore AP_VLAN in ieee80211_recalc_chanctx_chantype
      mac80211: fix smps mode check for AP_VLAN

Johannes Berg (2):
      Revert "mac80211: disable uAPSD if all ACs are under ACM"
      mac80211: fix agg_status debugfs file alignment

 include/net/regulatory.h   | 2 +-
 net/mac80211/chan.c        | 2 ++
 net/mac80211/debugfs_sta.c | 2 +-
 net/mac80211/iface.c       | 4 ++--
 net/mac80211/mesh_plink.c  | 7 ++++++-
 net/mac80211/mlme.c        | 3 +--
 net/mac80211/sta_info.c    | 7 +++++--
 7 files changed, 18 insertions(+), 9 deletions(-)

Re: pull-request: mac80211 2014-08-29

[John W. Linville]

On Fri, Aug 29, 2014 at 12:54:19PM +0200, Johannes Berg wrote:
> John,
> 
> Please excuse how late I'm sending this. Hopefully it can still go in.
> 
> Note that the tag is signed :)
> 
> johannes
> 
> 
> The following changes since commit c9d26423e56ce1ab4d786f92aebecf859d419293:
> 
>   Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2014-08-14 18:13:46 -0600)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-john-2014-08-29
> 
> for you to fetch changes up to 14b058bbce9279ee432f0944ca14df69f4a0d170:
> 
>   mac80211: fix agg_status debugfs file alignment (2014-08-26 11:13:37 +0200)
> 
> ----------------------------------------------------------------
> Here are a few fixes for mac80211. One has been discussed for a while
> and adds a terminating NUL-byte to the alpha2 sent to userspace, which
> shouldn't be necessary but since many places treat it as a string we
> couldn't move to just sending two bytes.
> 
> In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
> fix for the recently introduced RX aggregation offload, a revert for
> a broken patch (that luckily didn't really cause any harm) and a small
> fix for alignment in debugfs.
> 
> ----------------------------------------------------------------
> Bob Copeland (1):
>       mac80211: mesh_plink: handle confirm frames with new plid
> 
> Denton Gentry (1):
>       mac80211: fix start_seq_num in Rx reorder offload
> 
> Eliad Peller (1):
>       regulatory: add NUL to alpha2
> 
> Felix Fietkau (2):
>       mac80211: ignore AP_VLAN in ieee80211_recalc_chanctx_chantype
>       mac80211: fix smps mode check for AP_VLAN
> 
> Johannes Berg (2):
>       Revert "mac80211: disable uAPSD if all ACs are under ACM"
>       mac80211: fix agg_status debugfs file alignment

Pulling now...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.