Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-next/net/mac80211
History
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
..
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
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
cfg.c
mac80211: allow setting spatial reuse parameters from bss_conf
2019-07-31 11:00:52 +02:00
chan.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-22 08:59:24 -04:00
debugfs_key.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
debugfs_netdev.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-22 08:59:24 -04: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
2019-06-22 08:59:24 -04: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: AMPDU handling for rekeys with Extended Key ID
2019-07-26 13:29:10 +02: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: 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: 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
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
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
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: AMPDU handling for rekeys with Extended Key ID
2019-07-26 13:29:10 +02:00
key.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
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: Simplify Extended Key ID API
2019-07-26 13:28:59 +02:00
Makefile
mac80211: minstrel: merge with minstrel_ht, always enable VHT support
2018-10-11 16:01:01 +02:00
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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-08-06 18:44:57 -07: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
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
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: rc80211_minstrel: remove variance / stddev calculation
2018-10-11 16:01:05 +02:00
rc80211_minstrel_ht_debugfs.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
rc80211_minstrel_ht.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-22 08:59:24 -04:00
rc80211_minstrel_ht.h
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
rc80211_minstrel.c
mac80211: call rate_control_send_low() internally
2019-06-14 14:17:37 +02:00
rc80211_minstrel.h
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
rx.c
SPDX update for 5.2-rc6
2019-06-21 09:58:42 -07:00
scan.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
spectmgmt.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
sta_info.c
mac80211: remove unused and unneeded remove_sta_debugfs callback
2019-07-26 13:21:12 +02:00
sta_info.h
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
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
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
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: pass the vif to cancel_remain_on_channel
2019-07-26 13:08:28 +02:00
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
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +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