linux/net/mac80211
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c
aes_cmac.h
agg-rx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
agg-tx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
cfg.c mac80211: fix warning in ieee80211_probe_client 2011-11-11 14:29:35 -05:00
cfg.h
chan.c
debugfs_key.c
debugfs_key.h
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: add missing station flags to debugfs 2011-09-30 15:57:20 -04:00
debugfs_sta.h
debugfs.c net/mac80211/debugfs.c: use kstrtoul, etc 2011-11-09 16:14:10 -05:00
debugfs.h
driver-ops.h mac80211: verify virtual interfaces in driver API 2011-11-09 16:01:02 -05:00
driver-trace.c
driver-trace.h mac80211: allow out-of-band EOSP notification 2011-09-30 15:57:23 -04:00
event.c
ht.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
ibss.c mac80211: set carrier_on for ibss vifs only while joined 2011-11-11 12:32:49 -05:00
ieee80211_i.h mac80211: Save probe response data for bss 2011-11-11 12:32:51 -05:00
iface.c mac80211: Save probe response data for bss 2011-11-11 12:32:51 -05:00
Kconfig mac80211: handle TDLS high-level commands and frames 2011-09-30 15:57:07 -04:00
key.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
key.h
led.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
led.h
main.c mac80211: implement wifi TX status 2011-11-09 16:14:09 -05:00
Makefile
mesh_hwmp.c mac80211: simplify mesh frame queue mapping and QoS 2011-11-09 16:05:48 -05:00
mesh_pathtbl.c mac80211: simplify mesh frame queue mapping and QoS 2011-11-09 16:05:48 -05:00
mesh_plink.c mac80211: set HT capabilities for mesh peer 2011-11-08 15:54:33 -05:00
mesh.c mac80211: set HT capabilities for mesh peer 2011-11-08 15:54:33 -05:00
mesh.h mac80211: Avoid filling up mesh preq queue with redundant requests 2011-11-09 16:01:02 -05:00
michael.c
michael.h
mlme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
offchannel.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
pm.c mac80211: verify virtual interfaces in driver API 2011-11-09 16:01:02 -05:00
rate.c net: Fix files explicitly needing to include module.h 2011-10-31 19:30:28 -04:00
rate.h
rc80211_minstrel_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_minstrel_ht_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_minstrel_ht.c mac80211: max_tp_rate2 management of minstrel_ht 2011-09-30 15:16:25 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c minstrel: Remove unused function parameter in calc_rate_durations() 2011-11-11 12:32:52 -05:00
rc80211_minstrel.h
rc80211_pid_algo.c
rc80211_pid_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_pid.h
rx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
scan.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
spectmgmt.c mac80211: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
sta_info.c mac80211: uAPSD - fix IEEE80211_FCTL_MOREDATA bit setting 2011-11-07 13:19:15 -05:00
sta_info.h mac80211: send unexpected 4addr event 2011-11-09 16:13:53 -05:00
status.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
tkip.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
tkip.h
tx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
util.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
wep.c
wep.h
wme.c mac80211: simplify mesh frame queue mapping and QoS 2011-11-09 16:05:48 -05:00
wme.h mac80211: Mesh data frames must have the QoS header 2011-09-14 13:56:50 -04:00
work.c mac80211: simplify ieee80211_work_work 2011-11-09 16:01:01 -05:00
wpa.c mac80211: make sure hw_key exists before checking its flags 2011-11-11 12:32:51 -05:00
wpa.h