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

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

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

2016-03-08 12:34:12 -05: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

…

cfg.c

mac80211: move TKIP TX IVs to public part of key struct

2016-02-24 09:04:38 +01:00

chan.c

mac80211: Recalc min chandef when station is associated

2016-02-24 09:04:19 +01: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

…

debugfs_netdev.h

…

debugfs_sta.c

…

debugfs_sta.h

…

debugfs.c

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

debugfs.h

…

driver-ops.c

…

driver-ops.h

…

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

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

ieee80211_i.h

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

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

iface.c

mac80211: expose txq queue depth and size to drivers

2016-02-24 09:04:30 +01:00

Kconfig

…

key.c

mac80211: remove ieee80211_get_key_tx_seq/ieee80211_set_key_tx_seq

2016-02-24 09:04:39 +01: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

…

Makefile

…

mesh_hwmp.c

mac80211: use reset to set header pointer

2016-03-04 22:45:13 -05:00

mesh_pathtbl.c

mac80211: Unify mesh and mpp path removal function

2016-02-24 09:04:36 +01:00

mesh_plink.c

mac80211: mesh_plink: remove redundant sta_info check

2016-02-24 09:04:25 +01:00

mesh_ps.c

…

mesh_sync.c

…

mesh.c

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

mesh.h

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

michael.c

…

michael.h

…

mlme.c

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

ocb.c

…

offchannel.c

…

pm.c

…

rate.c

…

rate.h

…

rc80211_minstrel_debugfs.c

…

rc80211_minstrel_ht_debugfs.c

…

rc80211_minstrel_ht.c

mac80211: minstrel_ht: fix a logic error in RTS/CTS handling

2016-03-01 15:49:51 +01:00

rc80211_minstrel_ht.h

…

rc80211_minstrel.c

mac80211: minstrel: Change expected throughput unit back to Kbps

2016-02-02 15:57:02 +01:00

rc80211_minstrel.h

…

rx.c

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

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

scan.c

…

spectmgmt.c

…

sta_info.c

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

sta_info.h

mac80211: add API to allow filtering frames in BA sessions

2016-02-24 09:04:31 +01:00

status.c

mac80211: use reset to set header pointer

2016-03-04 22:45:13 -05:00

tdls.c

…

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

…

tx.c

mac80211: use reset to set header pointer

2016-03-04 22:45:13 -05:00

util.c

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2016-03-01 17:03:27 -05:00

vht.c

mac80211: move MU_MIMO_OWNER flag to ieee80211_vif

2016-02-24 09:04:40 +01:00

wep.c

…

wep.h

…

wme.c

…

wme.h

…

wpa.c

mac80211: move TKIP TX IVs to public part of key struct

2016-02-24 09:04:38 +01:00

wpa.h

…