original_kernel/net/mac80211
John W. Linville d07d152892 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
	drivers/net/wireless/iwmc3200wifi/cfg80211.c
	drivers/net/wireless/mwifiex/cfg80211.c
2012-07-12 15:21:05 -04:00
..
Kconfig mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
Makefile mac80211: rename driver-trace file 2012-06-24 11:32:38 +02:00
aes_ccm.c
aes_ccm.h
aes_cmac.c
aes_cmac.h
agg-rx.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
agg-tx.c mac80211: request TX status for BlockAck Requests 2012-07-07 21:35:42 +02:00
cfg.c nl80211: move scan API to wdev 2012-07-12 12:10:41 +02:00
cfg.h
chan.c mac80211: allow channel change while mesh is down 2012-06-05 15:21:47 -04:00
debug.h mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
debugfs.c mac80211: redesign scan RX 2012-07-12 12:10:44 +02:00
debugfs.h
debugfs_key.c mac80211: fix debugfs default key links 2012-07-06 08:33:04 +02:00
debugfs_key.h
debugfs_netdev.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
driver-ops.h mac80211: add TX prepare API 2012-07-03 13:50:34 +02:00
event.c
ht.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
ibss.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
ieee80211_i.h mac80211: add time synchronisation with BSS for assoc 2012-07-12 12:10:46 +02:00
iface.c mac80211: iterate the virtual monitor interface 2012-07-12 12:10:50 +02:00
key.c mac80211: remove ieee80211_key_removed 2012-07-09 14:49:15 +02:00
key.h
led.c
led.h
main.c mac80211: track scheduled scan virtual interface 2012-07-12 12:10:43 +02:00
mesh.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
mesh.h {nl,cfg,mac}80211: implement dot11MeshHWMPconfirmationInterval 2012-06-18 13:55:15 +02:00
mesh_hwmp.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
mesh_pathtbl.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
mesh_plink.c mac80211: don't expose ieee80211_add_srates_ie() 2012-06-28 10:35:50 +02:00
mesh_sync.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
michael.c
michael.h
mlme.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-07-12 15:21:05 -04:00
offchannel.c cfg80211: use wdev in mgmt-tx/ROC APIs 2012-07-09 14:51:47 +02:00
pm.c mac80211: fix cleanup if driver suspend callback fails 2012-06-20 17:39:51 +02:00
rate.c
rate.h
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-07-12 15:21:05 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel_ht_debugfs.c
rc80211_pid.h
rc80211_pid_algo.c
rc80211_pid_debugfs.c
rx.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-07-12 15:21:05 -04:00
scan.c mac80211: add time synchronisation with BSS for assoc 2012-07-12 12:10:46 +02:00
spectmgmt.c
sta_info.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
sta_info.h mac80211: add missing kernel-doc 2012-06-12 13:56:41 +02:00
status.c cfg80211: use wdev in mgmt-tx/ROC APIs 2012-07-09 14:51:47 +02:00
tkip.c mac80211: remove TKIP debug 2012-06-22 11:26:58 +02:00
tkip.h
trace.c mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
trace.h mac80211: add time synchronisation with BSS for assoc 2012-07-12 12:10:46 +02:00
tx.c mac80211: tx: do not drop non-robust mgmt to non-MFP stas. 2012-07-12 12:10:48 +02:00
util.c mac80211: iterate the virtual monitor interface 2012-07-12 12:10:50 +02:00
wep.c
wep.h
wme.c mac80211: save wmm_acm per sdata 2012-06-20 17:35:22 +02:00
wme.h mac80211: save wmm_acm per sdata 2012-06-20 17:35:22 +02:00
wpa.c
wpa.h