John W. Linville b37e3b6d64 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/net/wireless/rtlwifi/efuse.c drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c net/bluetooth/mgmt.c		2011-04-07 16:45:40 -04:00
..
aes_ccm.c	mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()	2010-11-15 13:26:11 -05:00
aes_ccm.h
aes_cmac.c	mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()	2010-11-15 13:26:11 -05:00
aes_cmac.h
agg-rx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-01-28 16:23:14 -05:00
agg-tx.c	mac80211: allow advertising correct maximum aggregate size	2011-01-19 11:36:12 -05:00
cfg.c	nl80211: Add BSS parameters to station	2011-04-07 15:34:12 -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: support separate default keys	2010-12-13 15:23:29 -05:00
debugfs_key.h	mac80211: support separate default keys	2010-12-13 15:23:29 -05:00
debugfs_netdev.c	mac80211: Add testing functionality for TKIP	2011-02-03 16:45:29 -05:00
debugfs_netdev.h	mac80211: reduce reliance on netdev	2009-12-21 18:38:52 -05:00
debugfs_sta.c	mac80211: Add timeout to BA session start API	2010-12-15 17:03:59 -05:00
debugfs_sta.h
debugfs.c	wifi: Add hwflags to debugfs.	2011-04-04 16:18:33 -04:00
debugfs.h	mac80211: refactor debugfs function generation code	2010-11-15 13:24:48 -05:00
driver-ops.h	mac80211: implement support for cfg80211_ops->{get,set}_ringparam	2011-03-11 15:34:10 -05:00
driver-trace.c
driver-trace.h	mac80211: implement support for cfg80211_ops->{get,set}_ringparam	2011-03-11 15:34:10 -05:00
event.c
ht.c	mac80211: copy peer MCS TX parameters	2011-02-25 15:33:39 -05:00
ibss.c	mac80211: fix suppressing probe responses in ad-hoc mode	2011-04-04 16:19:59 -04:00
ieee80211_i.h	mac80211: remove the dependency on crypto_blkcipher	2011-04-04 16:20:00 -04:00
iface.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
Kconfig	mac80211: remove the dependency on crypto_blkcipher	2011-04-04 16:20:00 -04:00
key.c	mac80211: fix possible NULL pointer dereference	2011-03-28 15:42:02 -04:00
key.h	mac80211: remove unused macros	2011-03-07 13:48:30 -05: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	mac80211: clean up station cleanup timer	2011-04-04 16:20:07 -04:00
Makefile	mac80211: add the minstrel_ht rate control algorithm	2010-06-02 16:12:59 -04:00
mesh_hwmp.c	nl80211/mac80211: define and allow configuring mesh element TTL	2010-12-06 16:01:28 -05:00
mesh_pathtbl.c	nl80211/mac80211: define and allow configuring mesh element TTL	2010-12-06 16:01:28 -05:00
mesh_plink.c	mac80211: Let userspace enable and configure vendor specific path selection.	2010-12-20 14:46:57 -05:00
mesh.c	cfg80211: Extend channel to frequency mapping for 802.11j	2011-01-21 15:34:17 -05:00
mesh.h	mac80211: Remove unused third address from mesh address extension header.	2010-12-20 14:49:47 -05:00
michael.c
michael.h
mlme.c	mac80211: remove few obsolete flags	2011-04-07 15:34:14 -04:00
offchannel.c	mac80211: Optimize scans on current operating channel.	2011-02-04 16:30:32 -05:00
pm.c	mac80211: assure we also cancel deferred scan request	2010-10-06 16:30:42 -04:00
rate.c	cfg80211/mac80211: improve ad-hoc multicast rate handling	2010-11-24 16:19:35 -05: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	mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS rates	2011-03-28 15:42:01 -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: don't complain about feedback for unrequested rates	2010-07-26 15:09:04 -04:00
rc80211_minstrel.h	minstrel: make the rate control ops reusable from another rc implementation	2010-03-10 17:44:23 -05: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	mac80211: remove unused macros	2011-03-07 13:48:30 -05:00
rx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-04-07 16:45:40 -04:00
scan.c	mac80211: fix scan race, simplify code	2011-03-07 13:51:04 -05:00
spectmgmt.c	mac80211: reduce reliance on netdev	2009-12-21 18:38:52 -05:00
sta_info.c	mac80211: clean up station cleanup timer	2011-04-04 16:20:07 -04:00
sta_info.h	mac80211: clean up station cleanup timer	2011-04-04 16:20:07 -04:00
status.c	mac80211: Minor optimization in tx status handling	2011-03-30 14:15:16 -04:00
tkip.c	mac80211: remove the dependency on crypto_blkcipher	2011-04-04 16:20:00 -04:00
tkip.h	mac80211: remove the dependency on crypto_blkcipher	2011-04-04 16:20:00 -04:00
tx.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
util.c	mac80211: clean up station cleanup timer	2011-04-04 16:20:07 -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: cleanup select_queue	2010-12-22 15:44:22 -05:00
wme.h	mac80211: fix skb buffering issue	2010-01-05 16:21:40 -05:00
work.c	mac80211: remove unused macros	2011-03-07 13:48:30 -05:00
wpa.c	mac80211: Add testing functionality for TKIP	2011-02-03 16:45:29 -05:00
wpa.h