David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Lots of easy overlapping changes in the confict
resolutions here.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-05-26 19:46:15 -04:00

..

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: agg-rx: Accept ADDBA request update if timeout did not change

2018-02-27 11:06:04 +01:00

agg-tx.c

mac80211: use timeout from the AddBA response instead of the request

2018-05-07 20:35:15 +02:00

cfg.c

mac80211: allocate and fill tidstats only when needed

2018-05-18 11:40:44 +02:00

chan.c

…

debug.h

…

debugfs_key.c

…

debugfs_key.h

…

debugfs_netdev.c

…

debugfs_netdev.h

…

debugfs_sta.c

…

debugfs_sta.h

…

debugfs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-03-23 11:31:58 -04:00

debugfs.h

…

driver-ops.c

…

driver-ops.h

mac80211: Support adding duration for prepare_tx() callback

2018-05-23 11:06:10 +02:00

ethtool.c

mac80211: allocate and fill tidstats only when needed

2018-05-18 11:40:44 +02:00

fils_aead.c

…

fils_aead.h

…

ht.c

mac80211: fix TX aggregation stop race

2018-05-18 11:14:36 +02:00

ibss.c

mac80211: Send control port frames over nl80211

2018-03-29 14:08:30 +02:00

ieee80211_i.h

mac80211: Support the new cfg80211 TXQ stats API

2018-05-08 13:25:22 +02:00

iface.c

mac80211: Send control port frames over nl80211

2018-03-29 14:08:30 +02:00

Kconfig

…

key.c

mac80211: allow AP_VLAN operation on crypto controlled devices

2018-03-29 11:35:22 +02:00

key.h

…

led.c

…

led.h

…

main.c

mac80211: Support the new cfg80211 TXQ stats API

2018-05-08 13:25:22 +02:00

Makefile

…

mesh_hwmp.c

…

mesh_pathtbl.c

…

mesh_plink.c

mac80211: mesh: fix premature update of rc stats

2018-05-18 10:02:28 +02:00

mesh_ps.c

…

mesh_sync.c

…

mesh.c

mac80211: notify driver for change in multicast rates

2018-03-23 13:23:17 +01:00

mesh.h

…

michael.c

…

michael.h

…

mlme.c

mac80211: Support adding duration for prepare_tx() callback

2018-05-23 11:06:10 +02:00

ocb.c

…

offchannel.c

…

pm.c

…

rate.c

…

rate.h

…

rc80211_minstrel_debugfs.c

net: Use octal not symbolic permissions

2018-03-26 12:07:48 -04:00

rc80211_minstrel_ht_debugfs.c

net: Use octal not symbolic permissions

2018-03-26 12:07:48 -04:00

rc80211_minstrel_ht.c

…

rc80211_minstrel_ht.h

…

rc80211_minstrel.c

net: Use octal not symbolic permissions

2018-03-26 12:07:48 -04:00

rc80211_minstrel.h

…

rx.c

mac80211: rename rtap_vendor_space to rtap_space

2018-05-07 20:49:44 +02:00

scan.c

mac80211: inform wireless layer when frame RSSI is invalid

2018-03-21 11:27:11 +01:00

spectmgmt.c

…

sta_info.c

mac80211: allocate and fill tidstats only when needed

2018-05-18 11:40:44 +02:00

sta_info.h

mac80211: allocate and fill tidstats only when needed

2018-05-18 11:40:44 +02:00

status.c

mac80211: average ack rssi support for data frames

2018-05-07 21:41:16 +02:00

tdls.c

…

tkip.c

…

tkip.h

…

trace_msg.h

…

trace.c

…

trace.h

mac80211: Support adding duration for prepare_tx() callback

2018-05-23 11:06:10 +02:00

tx.c

Merge remote-tracking branch 'net-next/master' into mac80211-next

2018-05-23 11:05:59 +02:00

util.c

mac80211: clean up rate info bandwidth setting

2018-05-07 20:49:52 +02:00

vht.c

mac80211: Use proper chan_width enum in sta opmode event

2018-03-29 10:19:59 +02:00

wep.c

…

wep.h

…

wme.c

…

wme.h

…

wpa.c

…

wpa.h

…