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

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

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

2016-06-30 05:03:36 -04: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

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

2016-03-08 12:34:12 -05:00

agg-tx.c

mac80211: implement fair queueing per txq

2016-06-09 11:34:08 +02:00

cfg.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +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_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

…

debugfs.c

mac80211: add debug knobs for fair queuing

2016-06-09 11:43:38 +02:00

debugfs.h

…

driver-ops.c

…

driver-ops.h

mac80211: synchronize driver rx queues before removing a station

2016-04-05 10:56:34 +02:00

ethtool.c

…

ht.c

…

ibss.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

ieee80211_i.h

mac80211: implement codel on fair queuing flows

2016-06-09 11:45:10 +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_hwmp.c

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

2016-04-09 17:41:41 -04:00

mesh_pathtbl.c

mac80211: mesh: embed gates hlist head directly

2016-04-05 21:34:51 +02:00

mesh_plink.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

mesh_ps.c

…

mesh_sync.c

…

mesh.c

mac80211: Fix mesh estab_plinks counting in STA removal case

2016-06-28 12:39:50 +02:00

mesh.h

mac80211: mesh: fix cleanup for mesh pathtable

2016-04-05 21:34:53 +02:00

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

…

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_debugfs.c

…

rc80211_minstrel_ht_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.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

rc80211_minstrel.h

…

rx.c

mac80211: implement fair queueing per txq

2016-06-09 11:34:08 +02:00

scan.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

spectmgmt.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

sta_info.c

mac80211: implement fair queueing per txq

2016-06-09 11:34:08 +02:00

sta_info.h

mac80211: fix fast_tx header alignment

2016-05-31 12:14:04 +02:00

status.c

mac80211: add separate last_ack variable

2016-04-06 13:18:16 +02:00

tdls.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +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

…

trace.c

…

trace.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

tx.c

mac80211: implement codel on fair queuing flows

2016-06-09 11:45:10 +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

…