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>
No related branches found
No related tags found
Showing
- drivers/bluetooth/ath3k.c 1 addition, 0 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/btusb.c 1 addition, 0 deletionsdrivers/bluetooth/btusb.c
- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 1 addition, 1 deletiondrivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
- drivers/net/wireless/iwlwifi/dvm/mac80211.c 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/dvm/mac80211.c
- drivers/net/wireless/iwlwifi/dvm/main.c 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/dvm/main.c
- drivers/net/wireless/iwlwifi/pcie/rx.c 21 additions, 2 deletionsdrivers/net/wireless/iwlwifi/pcie/rx.c
- net/bluetooth/hci_core.c 2 additions, 2 deletionsnet/bluetooth/hci_core.c
- net/bluetooth/mgmt.c 7 additions, 5 deletionsnet/bluetooth/mgmt.c
- net/bluetooth/smp.c 1 addition, 1 deletionnet/bluetooth/smp.c
- net/mac80211/cfg.c 3 additions, 0 deletionsnet/mac80211/cfg.c
- net/mac80211/ieee80211_i.h 2 additions, 0 deletionsnet/mac80211/ieee80211_i.h
- net/mac80211/main.c 4 additions, 2 deletionsnet/mac80211/main.c
- net/mac80211/scan.c 1 addition, 1 deletionnet/mac80211/scan.c
- net/mac80211/sta_info.c 8 additions, 3 deletionsnet/mac80211/sta_info.c
- net/mac80211/status.c 9 additions, 0 deletionsnet/mac80211/status.c
- net/mac80211/tx.c 6 additions, 3 deletionsnet/mac80211/tx.c
- net/mac80211/util.c 2 additions, 0 deletionsnet/mac80211/util.c
- net/wireless/reg.c 2 additions, 3 deletionsnet/wireless/reg.c
Loading
Please register or sign in to comment