kernel_optimize_test/net/mac80211
John W. Linville b38d355eaa Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c
2011-08-22 14:28:50 -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 rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
agg-tx.c mac80211: Stop TX BA session if buf_size is zero 2011-08-08 16:04:08 -04:00
cfg.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-08-22 14:28:50 -04:00
cfg.h
chan.c
debugfs_key.c mac80211: fix CMAC races 2011-07-08 11:11:20 -04:00
debugfs_key.h
debugfs_netdev.c
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
debugfs.c
debugfs.h
driver-ops.h mac80211: remove offchannel_tx API 2011-08-08 16:04:05 -04:00
driver-trace.c
driver-trace.h mac80211: sync driver before TX 2011-07-20 15:04:35 -04:00
event.c
ht.c mac80211: Stop BA session event from device 2011-06-07 14:41:36 -04:00
ibss.c rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
ieee80211_i.h cfg80211/mac80211: move information element parsing logic to cfg80211 2011-08-12 13:45:03 -04:00
iface.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
Kconfig
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
led.h
main.c mac80211: Don't use a buf_size=0 in ADDBA requests 2011-08-08 16:04:09 -04:00
Makefile
mesh_hwmp.c mac80211: fix erroneous clearing of MESH_PATH_SN_VALID flag 2011-08-10 14:07:43 -04:00
mesh_pathtbl.c net: cleanup some rcu_dereference_raw 2011-08-12 02:55:28 -07:00
mesh_plink.c
mesh.c
mesh.h
michael.c
michael.h
mlme.c mac80211: sync driver before TX 2011-07-20 15:04:35 -04:00
offchannel.c
pm.c mac80211: be more careful in suspend/resume 2011-07-15 13:39:42 -04:00
rate.c
rate.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c mac80211: Don't use EAPOL frames for rate sampling 2011-08-09 15:52:02 -04:00
rc80211_minstrel_ht.h
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
rc80211_pid_debugfs.c
rc80211_pid.h
rx.c mac80211: allow driver to disconnect after resume 2011-07-13 14:49:43 -04:00
scan.c mac80211: implement scan supported rates 2011-07-19 16:50:00 -04:00
spectmgmt.c
sta_info.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-08-22 14:28:50 -04:00
sta_info.h mac80211: simplify RX PN/IV handling 2011-07-08 11:42:21 -04:00
status.c mac80211: remove offchannel_tx API 2011-08-08 16:04:05 -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: Fill in skb->protocol information for injected frames 2011-08-09 15:52:01 -04:00
util.c cfg80211/mac80211: move information element parsing logic to cfg80211 2011-08-12 13:45:03 -04:00
wep.c
wep.h
wme.c wireless: unify QoS control field definitions 2011-06-27 15:09:39 -04:00
wme.h wireless: unify QoS control field definitions 2011-06-27 15:09:39 -04:00
work.c mac80211: sync driver before TX 2011-07-20 15:04:35 -04:00
wpa.c mac80211: simplify RX PN/IV handling 2011-07-08 11:42:21 -04:00
wpa.h