diff options
author | David S. Miller <davem@davemloft.net> | 2012-11-16 23:37:18 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-16 23:37:18 +0400 |
commit | a8203d3ccd7796675739aaa50f708a047601eed2 (patch) | |
tree | 6f01c67779feebc962187a96d7ffebd98d301c14 /Documentation | |
parent | baefa31db2f2b13a05d1b81bdf2d20d487f58b0a (diff) | |
parent | 26c6e80892d8c160dffaba85889bd4e65b1dacf6 (diff) | |
download | linux-a8203d3ccd7796675739aaa50f708a047601eed2.tar.xz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
This batch of fixes is intended for the 3.7 stream...
This includes a pull of the Bluetooth tree. Gustavo says:
"A few important fixes to go into 3.7. There is a new hw support by Marcos
Chaparro. Johan added a memory leak fix and hci device index list fix.
Also Marcel fixed a race condition in the device set up that was prevent the
bt monitor to work properly. Last, Paulo Sérgio added a fix to the error
status when pairing for LE fails. This was prevent userspace to work to handle
the failure properly."
Regarding the mac80211 pull, Johannes says:
"I have a locking fix for some SKB queues, a variable initialization to
avoid crashes in a certain failure case, another free_txskb fix from
Felix and another fix from him to avoid calling a stopped driver, a fix
for a (very unlikely) memory leak and a fix to not send null data
packets when resuming while not associated."
Regarding the iwlwifi pull, Johannes says:
"Two more fixes for iwlwifi ... one to use ieee80211_free_txskb(), and
one to check DMA mapping errors, please pull."
On top of that, Johannes also included a wireless regulatory fix
to allow 40 MHz on channels 12 and 13 in world roaming mode. Also,
Hauke Mehrtens fixes a #ifdef typo in brcmfmac.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions