David S. Miller 2f184393e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-10-20 10:43:00 -07:00
..
aead_api.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aead_api.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_ccm.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_cmac.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_cmac.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_gcm.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_gmac.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
aes_gmac.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
agg-rx.c	mac80211: add missing null return check from call to ieee80211_get_sband	2019-07-31 10:51:17 +02:00
agg-tx.c	mac80211: simplify TX aggregation start	2019-10-04 13:58:13 +02:00
cfg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
chan.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
debug.h
debugfs_key.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
debugfs_key.h
debugfs_netdev.c	mac80211: fix txq null pointer dereference	2019-10-01 17:56:19 +02:00
debugfs_netdev.h
debugfs_sta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
debugfs_sta.h
debugfs.c	mac80211: AMPDU handling for rekeys with Extended Key ID	2019-07-26 13:29:10 +02:00
debugfs.h
driver-ops.c	mac80211: don't warn about CW params when not using them	2019-07-20 21:40:32 +02:00
driver-ops.h	mac80211: pass the vif to cancel_remain_on_channel	2019-07-26 13:08:28 +02:00
ethtool.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 432	2019-06-05 17:37:16 +02:00
fils_aead.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
fils_aead.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
he.c	mac80211: fix possible NULL pointerderef in obss pd code	2019-08-21 10:58:32 +02:00
ht.c	mac80211: add support for the ADDBA extension element	2019-07-29 16:40:22 +02:00
ibss.c	mac80211: IBSS: avoid unneeded return value processing	2019-10-04 13:47:12 +02:00
ieee80211_i.h	mac80211: IBSS: send deauth when expiring inactive STAs	2019-09-11 09:33:29 +02:00
iface.c	mac80211: allow drivers to set max MTU	2019-09-11 09:33:29 +02:00
Kconfig	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
key.c	mac80211: don't check if key is NULL in ieee80211_key_link()	2019-09-11 09:33:28 +02:00
key.h	mac80211: clear crypto tx tailroom counter upon keys enable	2019-09-11 09:33:28 +02:00
led.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
led.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
main.c	mac80211: allow drivers to set max MTU	2019-09-11 09:33:29 +02:00
Makefile
mesh_hwmp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mesh_pathtbl.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mesh_plink.c	mac80211: implement HE support for mesh	2019-07-26 16:14:12 +02:00
mesh_ps.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mesh_sync.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mesh.c	mac80211: implement HE support for mesh	2019-07-26 16:14:12 +02:00
mesh.h	mac80211: implement HE support for mesh	2019-07-26 16:14:12 +02:00
michael.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
michael.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mlme.c	mac80211: Reject malformed SSID elements	2019-10-04 14:01:14 +02:00
ocb.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
offchannel.c	mac80211: pass the vif to cancel_remain_on_channel	2019-07-26 13:08:28 +02:00
pm.c
rate.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
rate.h	mac80211: remove unused and unneeded remove_sta_debugfs callback	2019-07-26 13:21:12 +02:00
rc80211_minstrel_debugfs.c	mac80211: minstrel_ht: rename prob_ewma to prob_avg, use it for the new average	2019-10-11 10:31:45 +02:00
rc80211_minstrel_ht_debugfs.c	mac80211: minstrel_ht: rename prob_ewma to prob_avg, use it for the new average	2019-10-11 10:31:45 +02:00
rc80211_minstrel_ht.c	mac80211: minstrel_ht: rename prob_ewma to prob_avg, use it for the new average	2019-10-11 10:31:45 +02:00
rc80211_minstrel_ht.h	mac80211: minstrel_ht: rename prob_ewma to prob_avg, use it for the new average	2019-10-11 10:31:45 +02:00
rc80211_minstrel.c	mac80211: minstrel_ht: rename prob_ewma to prob_avg, use it for the new average	2019-10-11 10:31:45 +02:00
rc80211_minstrel.h	mac80211: minstrel_ht: rename prob_ewma to prob_avg, use it for the new average	2019-10-11 10:31:45 +02:00
rx.c	mac80211: accept deauth frames in IBSS mode	2019-10-07 21:59:48 +02:00
scan.c	mac80211: fix scan when operating on DFS channels in ETSI domains	2019-10-07 22:10:50 +02:00
spectmgmt.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
sta_info.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
sta_info.h	mac80211: add assoc-at support	2019-08-21 10:58:10 +02:00
status.c	nl80211: Add support for EDMG channels	2019-08-21 11:07:35 +02:00
tdls.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 15:55:34 -07:00
tkip.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
tkip.h	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
trace_msg.h	mac80211: Increase MAX_MSG_LEN	2019-03-29 11:20:36 +01:00
trace.c
trace.h	mac80211: pass the vif to cancel_remain_on_channel	2019-07-26 13:08:28 +02:00
tx.c	mac80211: pass internal sta to ieee80211_tx_frags()	2019-10-04 13:57:50 +02:00
util.c	mac80211: keep BHs disabled while calling drv_tx_wake_queue()	2019-10-01 17:56:19 +02:00
vht.c	mac80211: vht: add support VHT EXT NSS BW in parsing VHT	2019-09-11 09:13:03 +02:00
wep.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
wep.h	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-07-08 20:57:08 -07:00
wme.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
wme.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
wpa.c	mac80211: add IEEE80211_KEY_FLAG_GENERATE_MMIE to ieee80211_key_flags	2019-07-26 16:14:12 +02:00
wpa.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00