diff options
author | David S. Miller <davem@davemloft.net> | 2014-07-24 23:22:15 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-24 23:22:15 -0700 |
commit | e62f77579cb6fbb05a703ffa1f9e9f81076e69aa (patch) | |
tree | 4dbde4571696cfc7357c803203e19a06fc3022fa /drivers/net/usb | |
parent | a88a7be6a2efcc4d3ea4543feb1b0d71d0100541 (diff) | |
parent | c01fac1c77a00227f706a1654317023e3f4ac7f0 (diff) | |
download | linux-e62f77579cb6fbb05a703ffa1f9e9f81076e69aa.tar.bz2 |
Merge tag 'master-2014-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
pull request: wireless 2014-07-24
Please pull this batch of fixes intended for the 3.16 stream...
For the mac80211 fixes, Johannes says:
"I have two fixes: one for tracing that fixes a long-standing NULL
pointer dereference, and one for a mac80211 issue that causes iwlmvm to
send invalid frames during authentication/association."
and,
"One more fix - for a bug in the newly introduced code that obtains rate
control information for stations."
For the iwlwifi fixes, Emmanuel says:
"It includes a merge damage fix. This region has been changed in -next
and -fixes quite a few times and apparently, I failed to handle it
properly, so here the fix. Along with that I have a fix from Eliad
to properly handle overlapping BSS in AP mode."
On top of that, Felix provides and ath9k fix for Tx stalls that happen
after an aggregation session failure.
Please let me know if there are problems! There are some changes
here that will cause merge conflicts in -next. Once you merge this
I can pull it into wireless-next and resolve those issues.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
0 files changed, 0 insertions, 0 deletions