John W. Linville 8e00f5fbb4 Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/wl12xx/main.c		2011-09-30 14:52:29 -04:00
..
aes_ccm.c	mac80211: use AES_BLOCK_SIZE	2011-07-08 11:11:24 -04:00
aes_ccm.h	mac80211: use AES_BLOCK_SIZE	2011-07-08 11:11:24 -04:00
aes_cmac.c	mac80211: use AES_BLOCK_SIZE	2011-07-08 11:11:24 -04:00
aes_cmac.h	mac80211: fix CMAC races	2011-07-08 11:11:20 -04:00
agg-rx.c	Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem	2011-09-19 15:00:16 -04:00
agg-tx.c	mac80211: make ieee80211_send_bar available for drivers	2011-09-14 13:56:16 -04:00
cfg.c	Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem	2011-09-30 14:52:29 -04:00
cfg.h
chan.c	mac80211: fix channel type recalculation with HT and non-HT interfaces	2011-03-14 14:46:58 -04:00
debugfs_key.c	mac80211: fix CMAC races	2011-07-08 11:11:20 -04:00
debugfs_key.h	mac80211: support separate default keys	2010-12-13 15:23:29 -05:00
debugfs_netdev.c	mac80211: add ieee80211_vif param to tsf functions	2011-09-27 14:27:48 -04:00
debugfs_netdev.h
debugfs_sta.c	mac80211: fix debugfs printk format warning	2011-04-19 15:38:03 -04:00
debugfs_sta.h
debugfs.c	mac80211: add ieee80211_vif param to tsf functions	2011-09-27 14:27:48 -04:00
debugfs.h	mac80211: refactor debugfs function generation code	2010-11-15 13:24:48 -05:00
driver-ops.h	mac80211: save tx params per sdata	2011-09-27 14:34:11 -04:00
driver-trace.c
driver-trace.h	mac80211: save tx params per sdata	2011-09-27 14:34:11 -04:00
event.c
ht.c	mac80211: Remove unnecessary OOM logging messages	2011-09-13 15:45:02 -04:00
ibss.c	Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem	2011-09-30 14:52:29 -04:00
ieee80211_i.h	mac80211: save tx params per sdata	2011-09-27 14:34:11 -04:00
iface.c	Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem	2011-09-30 14:52:29 -04:00
Kconfig	mac80211: improve mpath debugging	2011-08-24 13:59:41 -04:00
key.c	mac80211: let key iteration get keys in install order	2011-07-15 13:38:33 -04:00
key.h	mac80211: allow driver to disconnect after resume	2011-07-13 14:49:43 -04:00
led.c	mac80211: remove stray extern	2011-01-05 16:07:12 -05:00
led.h	mac80211: selective throughput LED trigger active	2010-12-22 14:33:37 -05:00
main.c	Merge branch 'master' of github.com:davem330/net	2011-09-22 03:23:13 -04:00
Makefile	mac80211: add the minstrel_ht rate control algorithm	2010-06-02 16:12:59 -04:00
mesh_hwmp.c	mac80211: Mesh data frames must have the QoS header	2011-09-14 13:56:50 -04:00
mesh_pathtbl.c	Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem	2011-09-19 15:00:16 -04:00
mesh_plink.c	mac80211: notify peer when shutting down peer link	2011-09-21 16:19:41 -04:00
mesh.c	mac80211: Mesh data frames must have the QoS header	2011-09-14 13:56:50 -04:00
mesh.h	mac80211: Improve mpath state locking	2011-09-13 15:42:32 -04:00
michael.c
michael.h
mlme.c	mac80211: save tx params per sdata	2011-09-27 14:34:11 -04:00
offchannel.c	mac80211: Optimize scans on current operating channel.	2011-02-04 16:30:32 -05:00
pm.c	mac80211: be more careful in suspend/resume	2011-07-15 13:39:42 -04:00
rate.c	mac80211: Send the management frame at requested rate	2011-09-27 14:34:10 -04:00
rate.h	mac80211: add the minstrel_ht rate control algorithm	2010-06-02 16:12:59 -04:00
rc80211_minstrel_debugfs.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
rc80211_minstrel_ht_debugfs.c	mac80211: disallow seeks in minstrel debug code	2010-09-16 10:33:17 +02:00
rc80211_minstrel_ht.c	minstrel_ht: fix Open BA session request floods	2011-09-14 13:56:23 -04:00
rc80211_minstrel_ht.h	minstrel_ht: move minstrel_mcs_groups declaration to header file	2010-06-24 15:42:18 -04:00
rc80211_minstrel.c	minstrel_ht: fixed rate mode through debugfs	2011-06-01 15:12:29 -04:00
rc80211_minstrel.h	minstrel_ht: fixed rate mode through debugfs	2011-06-01 15:12:29 -04:00
rc80211_pid_algo.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
rc80211_pid_debugfs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
rc80211_pid.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
rx.c	mac80211: Mesh data frames must have the QoS header	2011-09-14 13:56:50 -04:00
scan.c	mac80211: Send the management frame at requested rate	2011-09-27 14:34:10 -04:00
spectmgmt.c	mac80211: Remove unnecessary OOM logging messages	2011-09-13 15:45:02 -04:00
sta_info.c	Merge branch 'master' of github.com:davem330/net	2011-09-22 03:23:13 -04:00
sta_info.h	mac80211: retry sending failed BAR frames later instead of tearing down aggr	2011-09-13 15:42:30 -04:00
status.c	mac80211: fix endian issues and comments for BAR failure handling	2011-09-16 16:45:42 -04:00
tkip.c	mac80211: allow driver access to TKIP RX P1K	2011-07-15 13:38:32 -04:00
tkip.h	mac80211: fix TKIP races, make API easier to use	2011-07-08 11:11:19 -04:00
tx.c	mac80211: Mesh data frames must have the QoS header	2011-09-14 13:56:50 -04:00
util.c	mac80211: save tx params per sdata	2011-09-27 14:34:11 -04:00
wep.c	mac80211: remove the dependency on crypto_blkcipher	2011-04-04 16:20:00 -04:00
wep.h	mac80211: remove the dependency on crypto_blkcipher	2011-04-04 16:20:00 -04:00
wme.c	mac80211: Mesh data frames must have the QoS header	2011-09-14 13:56:50 -04:00
wme.h	mac80211: Mesh data frames must have the QoS header	2011-09-14 13:56:50 -04:00
work.c	mac80211: Send the management frame at requested rate	2011-09-27 14:34:10 -04:00
wpa.c	mac80211: simplify RX PN/IV handling	2011-07-08 11:42:21 -04:00
wpa.h