1
0
Fork 0
alistair23-linux/drivers/net/wireless
David S. Miller 3fd0202a0d Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:

====================
pull request: wireless-next 2014-07-25

Please pull this batch of updates intended for the 3.17 stream!

For the mac80211 bits, Johannes says:

"We have a lot of TDLS patches, among them a fix that should make hwsim
tests happy again. The rest, this time, is mostly small fixes."

For the Bluetooth bits, Gustavo says:

"Some more patches for 3.17. The most important change here is the move of
the 6lowpan code to net/6lowpan. It has been agreed with Davem that this
change will go through the bluetooth tree. The rest are mostly clean up and
fixes."

and,

"Here follows some more patches for 3.17. These are mostly fixes to what
we've sent to you before for next merge window."

For the iwlwifi bits, Emmanuel says:

"I have the usual amount of BT Coex stuff. Arik continues to work
on TDLS and Ariej contributes a few things for HS2.0. I added a few
more things to the firmware debugging infrastructure. Eran fixes a
small bug - pretty normal content."

And for the Atheros bits, Kalle says:

"For ath6kl me and Jessica added support for ar6004 hw3.0, our latest
version of ar6004.

For ath10k Janusz added a printout so that it's easier to check what
ath10k kconfig options are enabled. He also added a debugfs file to
configure maximum amsdu and ampdu values. Also we had few fixes as
usual."

On top of that is the usual large batch of various driver updates --
brcmfmac, mwifiex, the TI drivers, and wil6210 all get some action.
Rafał has also been very busy with b43 and related updates.

Also, I pulled the wireless tree into this in order to resolve a
merge conflict...

P.S.  The change to fs/compat_ioctl.c reflects a name change in a
Bluetooth header file...
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-07-28 17:36:25 -07:00
..
ath Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 2014-07-28 17:36:25 -07:00
b43 b43: enable 5 GHz support for N-PHY devices 2014-07-23 13:08:36 -04:00
b43legacy net: Replace min macro with min_t 2014-03-03 15:35:54 -05:00
brcm80211 Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 2014-07-28 17:36:25 -07:00
cw1200 cw1200: remove unnecessary break after return 2014-07-20 21:29:51 -07:00
hostap net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
ipw2x00 drivers/net/wireless/ipw2x00/libipw_module.c: remove unnecessary null test before kfree 2014-07-01 14:26:26 -04:00
iwlegacy mac80211: support more than one band in scan request 2014-06-25 09:10:42 +02:00
iwlwifi iwlwifi: mvm: teardown TDLS peers during chan-switch and AP DCM 2014-07-22 22:08:47 +03:00
libertas net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
libertas_tf
mwifiex Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 2014-07-28 17:36:25 -07:00
orinoco orinoco_usb: remove unnecessary break after goto 2014-07-13 23:45:24 -07:00
p54 p54: use request_firmware_direct() for optional EEPROM override 2014-06-25 15:40:40 -04:00
prism54 prism54: remove unnecessary break after return 2014-07-20 21:29:51 -07:00
rsi rsi: fix memory leaks and error handling in rsi_91x_usb 2014-07-01 14:26:26 -04:00
rt2x00 wireless: rt2x00: add new rt2800usb devices 2014-07-15 16:00:03 -04:00
rtl818x rtl818x_pci: fix pci probe returns success when it fails 2014-07-01 14:26:27 -04:00
rtlwifi rtlwifi: rtl8188ee: remove unnecessary break after return 2014-07-20 21:29:50 -07:00
ti wlcore/wl18xx/wl12xx: convert bitmaps to unsigned longs 2014-07-15 16:00:02 -04:00
zd1211rw wireless: zd1211rw: new url for fw, remove experimental 2014-07-15 16:00:17 -04:00
Kconfig rsi: Add RS9113 wireless driver 2014-03-17 13:51:52 -04:00
Makefile rsi: Add RS9113 wireless driver 2014-03-17 13:51:52 -04:00
adm8211.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2014-01-17 14:43:17 -05:00
adm8211.h
airo.c airo: remove unnecessary break after return 2014-07-20 21:29:51 -07:00
airo.h
airo_cs.c wireless: delete non-required instances of include <linux/init.h> 2014-01-03 15:37:01 -05:00
at76c50x-usb.c mac80211: support more than one band in scan request 2014-06-25 09:10:42 +02:00
at76c50x-usb.h at76c50x: fix scan does not work with latest mac80211 2014-06-05 14:15:08 -04:00
atmel.c atmel: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} 2014-02-28 14:11:13 -05:00
atmel.h drivers/net/wireless: Fix FSF address in file headers 2013-12-11 10:56:20 -05:00
atmel_cs.c wireless: delete non-required instances of include <linux/init.h> 2014-01-03 15:37:01 -05:00
atmel_pci.c wireless: delete non-required instances of include <linux/init.h> 2014-01-03 15:37:01 -05:00
mac80211_hwsim.c Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 2014-07-28 17:36:25 -07:00
mac80211_hwsim.h mac80211_hwsim: allow creation of single-channel radios with chanctx 2014-02-11 13:10:02 +01:00
mwl8k.c mwl8k: remove unnecessary break after return 2014-07-20 21:29:50 -07:00
ray_cs.c ray_cs: replace del_timer by del_timer_sync 2014-04-22 15:06:28 -04:00
ray_cs.h
rayctl.h
rndis_wlan.c cfg80211: constify MAC addresses in cfg80211 ops 2014-05-19 17:34:42 +02:00
wl3501.h
wl3501_cs.c wl3501_cs: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} 2014-02-28 14:12:36 -05:00
zd1201.c zd1201: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} 2014-02-28 14:12:36 -05:00
zd1201.h