linux/drivers/net/wireless/iwlegacy
David S. Miller 7009deab19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
	drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
	drivers/net/wireless/rtlwifi/rtl8192de/phy.h
	drivers/net/wireless/rtlwifi/rtl8723ae/phy.h

Just some minor conflicts between the wireless-next changes
and Joe Perches's "extern" removal from function prototypes
in header files.

John W. Linville says:

====================
Regarding the Bluetooth bits, Gustavo says:

"The big work here is from Marcel and Johan. They did a lot of work
in the L2CAP, HCI and MGMT layers. The most important ones are the
addition of a new MGMT command to enable/disable LE advertisement
and the introduction of the HCI user channel to allow applications
to get directly and exclusive access to Bluetooth devices."

As to the ath10k bits, Kalle says:

"Bartosz dropped support for qca98xx hw1.0 hardware from ath10k, it's
just too much to support it. Michal added support for the new firmware
interface. Marek fixed WEP in AP and IBSS mode. Rest of the changes are
minor fixes or cleanups."

And also:

"Major changes are:

* throughput improvements including aligning the RX frames correctly and
  optimising HTT layer (Michal)

* remove qca98xx hw1.0 support (Bartosz)

* add support for firmware version 999.999.0.636 (Michal)

* firmware htt statistics support (Kalle)

* fix WEP in AP and IBSS mode (Marek)

* fix a mutex unlock balance in debugfs file (Shafi)

And of course there's a lot of smaller fixes and cleanup."

For the wl12xx bits, Luca says:

"Here are some patches intended for 3.13.  Eliad is upstreaming a bunch
of patches that have been pending in the internal tree.  Mostly bugfixes
and other small improvements."

Along with that...

Arend and friends bring us a batch of brcmfmac updates, Larry Finger
offers some rtlwifi refactoring, and Sujith sends the usual batch of
ath9k updates.  As usual, there are a number of other small updates
from a variety of players as well.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-07 15:40:44 -04:00
..
3945-debug.c iwlegacy: move debugfs_ops to il_priv 2012-02-22 14:51:13 -05:00
3945-mac.c wireless: iwlegacy: remove unnecessary pci_set_drvdata() 2013-09-26 15:13:41 -04:00
3945-rs.c mac80211/rc80211: add chandef to rate initialization 2013-07-16 09:58:02 +03:00
3945.c iwl3945: better skb management in rx path 2013-07-24 11:02:04 -04:00
3945.h iwlegacy: Remove extern from function prototypes 2013-09-24 18:05:24 -07:00
4965-calib.c iwlegacy: remove enum iw_calib and related code 2012-02-29 14:14:55 -05:00
4965-debug.c iwlegacy: move debugfs_ops to il_priv 2012-02-22 14:51:13 -05:00
4965-mac.c wireless: iwlegacy: remove unnecessary pci_set_drvdata() 2013-09-26 15:13:41 -04:00
4965-rs.c mac80211/rc80211: add chandef to rate initialization 2013-07-16 09:58:02 +03:00
4965.c mac80211: support secondary channel offset in CSA 2013-04-16 15:29:44 +02:00
4965.h iwlegacy: Remove extern from function prototypes 2013-09-24 18:05:24 -07:00
commands.h wireless: move crypto constants to ieee80211.h 2013-05-16 22:39:41 +02:00
common.c iwl4965: reset firmware after rfkill off 2013-08-02 14:54:04 -04:00
common.h iwlegacy: Remove extern from function prototypes 2013-09-24 18:05:24 -07:00
csr.h
debug.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
iwl-spectrum.h
Kconfig iwlegacy: Kconfig: Change Debug Option to be more clear 2012-02-29 14:14:55 -05:00
Makefile
prph.h