David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -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	mac80211: Update BIP to support Beacon frames	2020-02-24 10:36:03 +01: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	mac80211: Update BIP to support Beacon frames	2020-02-24 10:36:03 +01: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: accept aggregation sessions on 6 GHz	2020-05-31 11:27:16 +02:00
agg-tx.c	mac80211: accept aggregation sessions on 6 GHz	2020-05-31 11:27:16 +02:00
airtime.c	mac80211: airtime: Fix an off by one in ieee80211_calc_rx_airtime()	2019-12-13 10:08:22 +01:00
cfg.c	mac80211: set short_slot for 6 GHz band	2020-05-31 11:27:22 +02:00
chan.c	mac80211: handle channel frequency offset	2020-04-24 12:33:43 +02:00
debug.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
debugfs_key.c	mac80211: Support BIGTK configuration for Beacon protection	2020-02-24 10:35:57 +01:00
debugfs_key.h	mac80211: Support BIGTK configuration for Beacon protection	2020-02-24 10:35:57 +01:00
debugfs_netdev.c	mac80211: mlme: remove duplicate AID bookkeeping	2020-04-24 11:46:11 +02:00
debugfs_netdev.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
debugfs_sta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2020-03-29 21:25:29 -07:00
debugfs_sta.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
debugfs.c	mac80211: debugfs: improve airtime_flags handler readability	2020-01-02 14:52:26 +01:00
debugfs.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
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: fix variable names in TID config methods	2020-05-27 10:02:01 +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: use HE 6 GHz band capability and pass it to the driver	2020-05-31 11:27:03 +02:00
ht.c	mac80211: Remove support for changing AP SMPS mode	2020-02-07 12:48:29 +01:00
ibss.c	mac80211: avoid using ext NSS high BW if not supported	2020-05-31 11:26:50 +02:00
ieee80211_i.h	mac80211: Add HE 6GHz capabilities element to probe request	2020-05-31 11:27:05 +02:00
iface.c	mac80211: fix drv_config_iface_filter() behaviour	2020-04-24 11:46:17 +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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2020-03-29 21:25:29 -07:00
key.h	mac80211: Support BIGTK configuration for Beacon protection	2020-02-24 10:35:57 +01: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: support control port TX status reporting	2020-05-28 09:02:14 +02:00
Makefile	mac80211: Import airtime calculation code from mt76	2019-11-22 13:36:25 +01:00
mesh_hwmp.c	mac80211: mesh: fix discovery timer re-arming issue / crash	2020-05-25 10:31:16 +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: use HE 6 GHz band capability and pass it to the driver	2020-05-31 11:27:03 +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: determine chandef from HE 6 GHz operation	2020-05-31 11:26:52 +02:00
mesh.h	mac80211: add HE 6 GHz Band Capability element	2020-05-31 11:26:39 +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: set short_slot for 6 GHz band	2020-05-31 11:27:22 +02:00
ocb.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
offchannel.c	mac80211: handle channel frequency offset	2020-04-24 12:33:43 +02:00
pm.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
rate.c	mac80211: populate debugfs only after cfg80211 init	2020-04-24 11:30:13 +02:00
rate.h	mac80211: populate debugfs only after cfg80211 init	2020-04-24 11:30:13 +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	One batch of changes, containing:	2020-05-26 20:17:35 -07: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: fix HT-Control field reception for management frames	2020-05-27 10:03:27 +02:00
scan.c	mac80211: Add HE 6GHz capabilities element to probe request	2020-05-31 11:27:05 +02:00
spectmgmt.c	mac80211: avoid using ext NSS high BW if not supported	2020-05-31 11:26:50 +02:00
sta_info.c	mac80211: sta_info: Add lockdep condition for RCU list usage	2020-04-24 11:31:20 +02:00
sta_info.h	mac80211: fix two missing documentation entries	2020-04-24 12:40:20 +02:00
status.c	mac80211: support control port TX status reporting	2020-05-28 09:02:14 +02:00
tdls.c	mac80211: support control port TX status reporting	2020-05-28 09:02:14 +02:00
tkip.c	mac80211: Fix TKIP replay protection immediately after key setup	2020-01-15 09:52:12 +01: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	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
trace.h	mac80211: handle channel frequency offset	2020-04-24 12:33:43 +02:00
tx.c	mac80211: support control port TX status reporting	2020-05-28 09:02:14 +02:00
util.c	mac80211: Add HE 6GHz capabilities element to probe request	2020-05-31 11:27:05 +02:00
vht.c	mac80211: implement Operating Mode Notification extended NSS support	2020-04-24 12:33:42 +02:00
wep.c	mac80211: make ieee80211_wep_init() return void	2020-02-07 12:40:34 +01:00
wep.h	mac80211: make ieee80211_wep_init() return void	2020-02-07 12:40:34 +01: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