David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
aes_ccm.c	mac80211: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
aes_ccm.h	mac80111: Add CCMP-256 cipher	2015-01-27 11:07:35 +01:00
aes_cmac.c	mac80211: remove ieee80211_aes_cmac_calculate_k1_k2()	2015-08-13 11:31:45 +02:00
aes_cmac.h	mac80111: Add BIP-CMAC-256 cipher	2015-01-27 11:09:13 +01:00
aes_gcm.c	mac80211: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
aes_gcm.h	mac80111: Add GCMP and GCMP-256 ciphers	2015-01-27 11:06:09 +01:00
aes_gmac.c	mac80211: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
aes_gmac.h	mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers	2015-01-27 11:10:13 +01:00
agg-rx.c	mac80211: agg-rx: refuse ADDBA Request with timeout update	2016-07-06 14:44:14 +02:00
agg-tx.c	mac80211: implement fair queueing per txq	2016-06-09 11:34:08 +02:00
cfg.c	mac80211: fix purging multicast PS buffer queue	2016-08-05 14:06:28 +02:00
chan.c	mac80211: recalc min_def chanctx even when chandef is identical	2016-04-05 10:51:08 +02:00
debug.h	mac80211: 802.11p OCB mode support	2014-11-04 13:18:21 +01:00
debugfs_key.c	mac80211: move TKIP TX IVs to public part of key struct	2016-02-24 09:04:38 +01:00
debugfs_key.h
debugfs_netdev.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
debugfs_netdev.h	mac80211: fix some missing includes	2014-04-09 14:49:43 +02:00
debugfs_sta.c	mac80211: add vht cap decode to debugfs	2016-05-31 13:07:54 +02:00
debugfs_sta.h
debugfs.c	mac80211: add debug knobs for fair queuing	2016-06-09 11:43:38 +02:00
debugfs.h	mac80211: fix some missing includes	2014-04-09 14:49:43 +02:00
driver-ops.c	mac80211: pass block ack session timeout to to driver	2016-01-14 11:13:17 +01:00
driver-ops.h	mac80211: call get_expected_throughput only after adding station	2016-08-11 20:00:37 +02:00
ethtool.c	mac80211: move station statistics into sub-structs	2015-10-21 10:08:22 +02:00
ht.c	mac80211: limit the A-MSDU Tx based on peer's capabilities	2016-02-24 09:04:20 +01:00
ibss.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
ieee80211_i.h	mac80211: Add support for beacon report radio measurement	2016-07-06 14:53:19 +02:00
iface.c	mac80211: implement fair queueing per txq	2016-06-09 11:34:08 +02:00
Kconfig	mac80211: use DECLARE_EWMA	2015-08-14 17:49:53 +02:00
key.c	mac80211: add fast-rx path	2016-04-06 13:18:18 +02:00
key.h	mac80211: move TKIP TX IVs to public part of key struct	2016-02-24 09:04:38 +01:00
led.c	mac80211: fix throughput LED trigger	2015-05-11 19:16:04 +02:00
led.h	mac80211: make LED triggering depend on activation	2015-05-05 14:21:56 +02:00
main.c	mac80211: implement fair queueing per txq	2016-06-09 11:34:08 +02:00
Makefile	mac80211: remove event.c	2015-10-14 18:40:26 +02:00
mesh_hwmp.c	mac80211: mesh: Add support for HW RC implementation	2016-08-11 16:51:40 +02:00
mesh_pathtbl.c	mac80211: mesh: embed gates hlist head directly	2016-04-05 21:34:51 +02:00
mesh_plink.c	mac80211: use common cleanup for user/!user_mpm	2016-06-30 12:06:41 +02:00
mesh_ps.c	mac80211: mesh: separate plid and aid concepts	2015-07-17 15:47:11 +02:00
mesh_sync.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
mesh.c	mac80211: mesh: flush stations before beacons are stopped	2016-08-03 08:45:15 +02:00
mesh.h	mac80211: mesh: fix cleanup for mesh pathtable	2016-04-05 21:34:53 +02:00
michael.c
michael.h	mac80211: fix some missing includes	2014-04-09 14:49:43 +02:00
mlme.c	mac80211: remove disconnected APs from BSS table	2016-05-12 11:14:23 +02:00
ocb.c	mac80211: remove rx_stats.last_rx update after sta alloc	2016-04-06 13:18:15 +02:00
offchannel.c	mac80211: avoid ROC during hw restart	2016-01-14 11:10:14 +01:00
pm.c	mac80211: don't reconfigure sched scan in case of wowlan	2015-11-03 10:42:05 +01:00
rate.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
rate.h	mac80211: remove sta_info debugfs sub-struct	2016-04-05 11:59:05 +02:00
rc80211_minstrel_debugfs.c	mac80211: minstrel[_ht]: remove non-ascii debugfs characters	2015-09-29 15:56:47 +02:00
rc80211_minstrel_ht_debugfs.c	mac80211: minstrel[_ht]: remove non-ascii debugfs characters	2015-09-29 15:56:47 +02:00
rc80211_minstrel_ht.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
rc80211_minstrel_ht.h	mac80211: add max lossless throughput per rate	2015-04-01 20:44:32 +02:00
rc80211_minstrel.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
rc80211_minstrel.h	mac80211: add standard deviation to Minstrel stats	2015-04-01 20:44:33 +02:00
rx.c	mac80211: fix check for buffered powersave frames with txq	2016-08-02 09:50:26 +02:00
scan.c	mac80211: report failure to start (partial) scan as scan abort	2016-07-06 14:54:38 +02:00
spectmgmt.c	mac80211: parse wide bandwidth channel switch IE with workaround	2016-07-06 14:55:04 +02:00
sta_info.c	mac80211: call get_expected_throughput only after adding station	2016-08-11 20:00:37 +02:00
sta_info.h	mac80211: mesh: Add support for HW RC implementation	2016-08-11 16:51:40 +02:00
status.c	mac80211: End the MPSP even if EOSP frame was not acked	2016-08-05 14:06:29 +02:00
tdls.c	mac80211: TDLS: don't require beaconing for AP BW	2016-08-30 08:03:41 +02:00
tkip.c	mac80211: move TKIP TX IVs to public part of key struct	2016-02-24 09:04:38 +01:00
tkip.h	mac80211: move TKIP TX IVs to public part of key struct	2016-02-24 09:04:38 +01:00
trace_msg.h	mac80211: Move message tracepoints to their own header	2015-04-07 12:32:09 -04:00
trace.c	mac80211: Move message tracepoints to their own header	2015-04-07 12:32:09 -04:00
trace.h	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
tx.c	mac80211: remove skb header offset mangling in ieee80211_build_hdr	2016-08-11 16:51:41 +02:00
util.c	mac80211: implement fair queueing per txq	2016-06-09 11:34:08 +02:00
vht.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
wep.c	mac80211: move WEP tailroom size check	2015-05-11 14:51:29 +02:00
wep.h	mac80211: move RX WEP weak IV counting	2012-03-13 14:54:16 -04:00
wme.c	mac80211: synchronously reserve TID per station	2014-11-19 18:45:36 +01:00
wme.h	mac80211: add WMM admission control support	2014-10-22 10:42:09 +02:00
wpa.c	mac80211: allow same PN for AMSDU sub-frames	2016-05-12 11:14:45 +02:00
wpa.h	mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers	2015-01-27 11:10:13 +01:00