Johannes Berg 1e1430d528 Merge remote-tracking branch 'net-next/master' into mac80211-next ... Resolve the merge conflict between Felix's/my and Toke's patches coming into the tree through net and mac80211-next respectively. Most of Felix's changes go away due to Toke's new infrastructure work, my patch changes to "goto begin" (the label wasn't there before) instead of returning NULL so flow control towards drivers is preserved better. Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2016-10-04 09:46:44 +02:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c
aes_cmac.h
aes_gcm.c
aes_gcm.h
aes_gmac.c
aes_gmac.h
agg-rx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-23 06:46:57 -04:00
agg-tx.c	mac80211: reject TSPEC TIDs (TSIDs) for aggregation	2016-09-15 10:08:52 +02:00
cfg.c	mac80211: Add API to report NAN function match	2016-09-30 13:21:57 +02:00
chan.c	mac80211: add boilerplate code for start / stop NAN	2016-09-30 13:21:19 +02:00
debug.h
debugfs_key.c
debugfs_key.h
debugfs_netdev.c	mac80211: add offset_tsf driver op and use it for mesh	2016-09-30 13:45:44 +02:00
debugfs_netdev.h
debugfs_sta.c	mac80211: remove sta_remove_debugfs driver callback	2016-09-15 16:46:19 +02:00
debugfs_sta.h
debugfs.c	mac80211: Export fq memory limit information in debugfs	2016-09-30 13:29:31 +02:00
debugfs.h
driver-ops.c	mac80211: add offset_tsf driver op and use it for mesh	2016-09-30 13:45:44 +02:00
driver-ops.h	mac80211: add offset_tsf driver op and use it for mesh	2016-09-30 13:45:44 +02:00
ethtool.c
ht.c
ibss.c
ieee80211_i.h	Merge remote-tracking branch 'net-next/master' into mac80211-next	2016-10-04 09:46:44 +02:00
iface.c	mac80211: Implement add_nan_func and rm_nan_func	2016-09-30 13:21:52 +02:00
Kconfig
key.c
key.h
led.c
led.h
main.c	mac80211: Implement add_nan_func and rm_nan_func	2016-09-30 13:21:52 +02:00
Makefile
mesh_hwmp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-23 06:46:57 -04:00
mesh_pathtbl.c	mac80211: make mpath path fixing more robust	2016-09-12 12:27:14 +02:00
mesh_plink.c	mac80211: use common cleanup for user/!user_mpm	2016-06-30 12:06:41 +02:00
mesh_ps.c
mesh_sync.c	mac80211: mesh: decrease max drift	2016-09-30 13:47:00 +02:00
mesh.c	mac80211: mesh: flush stations before beacons are stopped	2016-08-03 08:45:15 +02:00
mesh.h
michael.c
michael.h
mlme.c	mac80211: fix possible out-of-bounds access	2016-09-15 16:46:16 +02:00
ocb.c
offchannel.c	mac80211: add boilerplate code for start / stop NAN	2016-09-30 13:21:19 +02:00
pm.c	mac80211: remove useless open_count check	2016-09-13 15:39:29 +02:00
rate.c
rate.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c
rc80211_minstrel_ht.h
rc80211_minstrel.c
rc80211_minstrel.h
rx.c	Merge remote-tracking branch 'net-next/master' into mac80211-next	2016-10-04 09:46:44 +02:00
scan.c	mac80211: fix scan completed tracing	2016-09-15 16:46:16 +02:00
spectmgmt.c	mac80211: parse wide bandwidth channel switch IE with workaround	2016-07-06 14:55:04 +02:00
sta_info.c	Merge remote-tracking branch 'net-next/master' into mac80211-next	2016-10-04 09:46:44 +02:00
sta_info.h	mac80211: Use rhltable instead of rhashtable	2016-09-20 04:43:36 -04:00
status.c	mac80211: Use rhltable instead of rhashtable	2016-09-20 04:43:36 -04:00
tdls.c	mac80211: TDLS: don't require beaconing for AP BW	2016-08-30 08:03:41 +02:00
tkip.c
tkip.h
trace_msg.h
trace.c
trace.h	mac80211: add offset_tsf driver op and use it for mesh	2016-09-30 13:45:44 +02:00
tx.c	Merge remote-tracking branch 'net-next/master' into mac80211-next	2016-10-04 09:46:44 +02:00
util.c	mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue	2016-09-30 14:46:57 +02:00
vht.c
wep.c
wep.h
wme.c
wme.h
wpa.c
wpa.h