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
aes_ccm.h
aes_cmac.c
aes_cmac.h
aes_gcm.c
aes_gcm.h
aes_gmac.c
aes_gmac.h
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
debugfs.c	mac80211: add debug knobs for fair queuing	2016-06-09 11:43:38 +02:00
debugfs.h
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
debugfs_sta.c	mac80211: add vht cap decode to debugfs	2016-05-31 13:07:54 +02:00
debugfs_sta.h
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
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
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
led.h
main.c	mac80211: implement fair queueing per txq	2016-06-09 11:34:08 +02:00
Makefile
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
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
mesh_sync.c
michael.c
michael.h
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
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.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
rc80211_minstrel.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
rc80211_minstrel_ht.h
rc80211_minstrel_ht_debugfs.c
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.c
trace.h	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
trace_msg.h
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
wep.h
wme.c
wme.h
wpa.c	mac80211: allow same PN for AMSDU sub-frames	2016-05-12 11:14:45 +02:00
wpa.h