Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
This is one more set of fixes intended for the 3.11 stream...
For the mac80211 bits, Johannes says:
"I have three more patches for the 3.11 stream: Felix's fix for the
fairly visible brcmsmac crash, a fix from Simon for an IBSS join bug I
found and a fix for a channel context bug in IBSS I'd introduced."
Along with those...
Sujith Manoharan makes a minor change to not use a PLL hang workaroun
for AR9550. This one-liner fixes a couple of bugs reported in the Red Hat
bugzilla.
Helmut Schaa addresses an ath9k_htc bug that mangles frame headers
during Tx. This fix is small, tested by the bug reported and isolated
to ath9k_htc.
Stanislaw Gruszka reverts a recent iwl4965 change that broke rfkill
notification to user space.
Please let me know if there are problems!
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c 10 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/htc_drv_txrx.c
- drivers/net/wireless/ath/ath9k/init.c 2 additions, 1 deletiondrivers/net/wireless/ath/ath9k/init.c
- drivers/net/wireless/ath/ath9k/main.c 1 addition, 2 deletionsdrivers/net/wireless/ath/ath9k/main.c
- drivers/net/wireless/ath/carl9170/main.c 2 additions, 1 deletiondrivers/net/wireless/ath/carl9170/main.c
- drivers/net/wireless/iwlegacy/4965-mac.c 1 addition, 1 deletiondrivers/net/wireless/iwlegacy/4965-mac.c
- drivers/net/wireless/rt2x00/rt2800lib.c 2 additions, 1 deletiondrivers/net/wireless/rt2x00/rt2800lib.c
- include/net/mac80211.h 1 addition, 0 deletionsinclude/net/mac80211.h
- net/mac80211/ibss.c 30 additions, 4 deletionsnet/mac80211/ibss.c
- net/mac80211/rc80211_minstrel_ht.c 3 additions, 0 deletionsnet/mac80211/rc80211_minstrel_ht.c
Please register or sign in to comment