1
0
Fork 0
alistair23-linux/net/mac80211
David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-06 18:44:57 -07:00
..
Kconfig
Makefile
aead_api.c
aead_api.h
aes_ccm.h
aes_cmac.c
aes_cmac.h
aes_gcm.h
aes_gmac.c
aes_gmac.h
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
cfg.c mac80211: allow setting spatial reuse parameters from bss_conf 2019-07-31 11:00:52 +02:00
chan.c
debug.h
debugfs.c mac80211: AMPDU handling for rekeys with Extended Key ID 2019-07-26 13:29:10 +02:00
debugfs.h
debugfs_key.c
debugfs_key.h
debugfs_netdev.c
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.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
fils_aead.c
fils_aead.h
he.c mac80211: allow setting spatial reuse parameters from bss_conf 2019-07-31 11:00:52 +02:00
ht.c mac80211: add support for the ADDBA extension element 2019-07-29 16:40:22 +02:00
ibss.c
ieee80211_i.h mac80211: allow setting spatial reuse parameters from bss_conf 2019-07-31 11:00:52 +02:00
iface.c Revert "mac80211: set NETIF_F_LLTX when using intermediate tx queues" 2019-07-30 14:52:50 +02:00
key.c mac80211: AMPDU handling for rekeys with Extended Key ID 2019-07-26 13:29:10 +02:00
key.h
led.c
led.h
main.c mac80211: Simplify Extended Key ID API 2019-07-26 13:28:59 +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
mesh_hwmp.c
mesh_pathtbl.c
mesh_plink.c mac80211: implement HE support for mesh 2019-07-26 16:14:12 +02:00
mesh_ps.c
mesh_sync.c
michael.c
michael.h
mlme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2019-08-06 18:44:57 -07:00
ocb.c
offchannel.c mac80211: pass the vif to cancel_remain_on_channel 2019-07-26 13:08:28 +02:00
pm.c
rate.c
rate.h mac80211: remove unused and unneeded remove_sta_debugfs callback 2019-07-26 13:21:12 +02:00
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht.c
rc80211_minstrel_ht.h
rc80211_minstrel_ht_debugfs.c
rx.c
scan.c
spectmgmt.c
sta_info.c mac80211: remove unused and unneeded remove_sta_debugfs callback 2019-07-26 13:21:12 +02:00
sta_info.h
status.c mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header 2019-07-26 16:14:06 +02:00
tdls.c
tkip.c
tkip.h
trace.c
trace.h mac80211: pass the vif to cancel_remain_on_channel 2019-07-26 13:08:28 +02:00
trace_msg.h
tx.c mac80211: propagate struct ieee80211_tx_status into ieee80211_tx_monitor() 2019-07-26 13:41:45 +02:00
util.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2019-08-06 18:44:57 -07:00
vht.c
wep.c
wep.h
wme.c
wme.h
wpa.c mac80211: add IEEE80211_KEY_FLAG_GENERATE_MMIE to ieee80211_key_flags 2019-07-26 16:14:12 +02:00
wpa.h