pull-request: mac80211 2013-12-19

pull-request: mac80211 2013-12-19

[Johannes Berg]

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

John,

Just before the holidays, didn't you want more pull requests? ;-)
Sorry, but I think this should still go in...

I have a fix from Javier for mac80211_hwsim when used with wmediumd
userspace, and a fix from Felix for buffering in AP mode.

I might not have sent in the wmediumd fix since it's mostly a debug
tool, but hey, I have to send in a pull request for the other one anyway
and it is a simple patch and bad bug, so ... Let me know if there's any
problem.

johannes

---

The following changes since commit bd02cd2549cfcdfc57cb5ce57ffc3feb94f70575:

  radiotap: fix bitmap-end-finding buffer overrun (2013-12-16 12:06:43 +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 277d916fc2e959c3f106904116bb4f7b1148d47a:

  mac80211: move "bufferable MMPDU" check to fix AP mode scan (2013-12-16 21:44:05 +0100)

----------------------------------------------------------------
Felix Fietkau (1):
      mac80211: move "bufferable MMPDU" check to fix AP mode scan

Javier Lopez (1):
      mac80211_hwsim: Fix NULL pointer dereference

 drivers/net/wireless/mac80211_hwsim.c |  2 +-
 net/mac80211/tx.c                     | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)


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

Re: pull-request: mac80211 2013-12-19

[John W. Linville]

On Thu, Dec 19, 2013 at 09:22:28PM +0100, Johannes Berg wrote:
> John,
> 
> Just before the holidays, didn't you want more pull requests? ;-)
> Sorry, but I think this should still go in...
> 
> I have a fix from Javier for mac80211_hwsim when used with wmediumd
> userspace, and a fix from Felix for buffering in AP mode.
> 
> I might not have sent in the wmediumd fix since it's mostly a debug
> tool, but hey, I have to send in a pull request for the other one anyway
> and it is a simple patch and bad bug, so ... Let me know if there's any
> problem.
> 
> johannes
> 
> ---
> 
> The following changes since commit bd02cd2549cfcdfc57cb5ce57ffc3feb94f70575:
> 
>   radiotap: fix bitmap-end-finding buffer overrun (2013-12-16 12:06:43 +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 277d916fc2e959c3f106904116bb4f7b1148d47a:
> 
>   mac80211: move "bufferable MMPDU" check to fix AP mode scan (2013-12-16 21:44:05 +0100)

Pulling now...

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