Merge branch 'for-davem' of...
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into wireless John W. Linville says: ==================== This will probably be the last batch of wireless fixes intended for 3.10. Many of these are one- or two-liners, and a couple of others are mostly relocating existing code to avoid races or to limit the code to effecting specific hardware, etc. The mac80211 fixes have a couple of exceptions to the above. Regarding those, Johannes says: "Following davem's complaint about my patch, here's a new pull request w/o the patch he was complaining about, but instead with the const fix rolled into the fix. I have a fix for radar detection, one for rate control and a workaround for broken HT APs which is a regression fix because we didn't rely on them to be correct before." Johannes also sends some iwlwifi fixes: "I picked up Nikolay's patch for the chain noise calibration bug that seems to have been there forever, a fix from Emmanuel for setting TX flags on BAR frames and a fix of my own to avoid printing request_module() errors if the kernel isn't even modular. We also have our own version of Stanislaw's fix for rate control." Along with those... Anderson Lizardo fixes a Bluetooth memory corruption bug when an MTU value is set to too small of a value. Arend van Spriel sends a revised brcmsmac bug that fixes a regression caused by a bad return value in an earlier patch. He also sends a brcmfmac fix to avoid an oops when loading the driver at boot. Daniel Drake fixes a race condition in btmrvl that causes hangs on suspend for OLPC hardware. Johan Hedberg adds a check to avoid sending a HCI_Delete_Stored_Link_Key command to devices that don't support them, avoiding some scary looking log spam. Stanislaw Gruszka gives us a fix for iwlegacy to be able to use rates higher than 1Mb/s on older wireless networks. He also sends an rt2x00 fix to reinstate older tx power handling behavior for some devices that didn't work well with the current code. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- drivers/bluetooth/btmrvl_main.c 4 additions, 5 deletionsdrivers/bluetooth/btmrvl_main.c
- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c 4 additions, 0 deletionsdrivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
- drivers/net/wireless/brcm80211/brcmsmac/main.c 2 additions, 15 deletionsdrivers/net/wireless/brcm80211/brcmsmac/main.c
- drivers/net/wireless/iwlegacy/3945-rs.c 1 addition, 0 deletionsdrivers/net/wireless/iwlegacy/3945-rs.c
- drivers/net/wireless/iwlegacy/4965-rs.c 1 addition, 1 deletiondrivers/net/wireless/iwlegacy/4965-rs.c
- drivers/net/wireless/iwlwifi/dvm/rs.c 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/dvm/rs.c
- drivers/net/wireless/iwlwifi/dvm/rxon.c 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/dvm/rxon.c
- drivers/net/wireless/iwlwifi/iwl-drv.c 2 additions, 0 deletionsdrivers/net/wireless/iwlwifi/iwl-drv.c
- drivers/net/wireless/iwlwifi/mvm/rs.c 1 addition, 0 deletionsdrivers/net/wireless/iwlwifi/mvm/rs.c
- drivers/net/wireless/iwlwifi/mvm/tx.c 2 additions, 1 deletiondrivers/net/wireless/iwlwifi/mvm/tx.c
- drivers/net/wireless/rt2x00/rt2800lib.c 18 additions, 11 deletionsdrivers/net/wireless/rt2x00/rt2800lib.c
- net/bluetooth/hci_core.c 10 additions, 5 deletionsnet/bluetooth/hci_core.c
- net/bluetooth/l2cap_core.c 3 additions, 0 deletionsnet/bluetooth/l2cap_core.c
- net/mac80211/cfg.c 6 additions, 0 deletionsnet/mac80211/cfg.c
- net/mac80211/ieee80211_i.h 3 additions, 2 deletionsnet/mac80211/ieee80211_i.h
- net/mac80211/mlme.c 80 additions, 7 deletionsnet/mac80211/mlme.c
- net/mac80211/rate.c 1 addition, 1 deletionnet/mac80211/rate.c
- net/mac80211/util.c 2 additions, 2 deletionsnet/mac80211/util.c
Loading
Please register or sign in to comment