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

Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

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

2015-06-01 22:51:30 -07:00

..

aes_ccm.c

mac80111: aes_ccm: cleanup ieee80211_aes_key_setup_encrypt()

2015-03-30 10:40:03 +02:00

aes_ccm.h

…

aes_cmac.c

…

aes_cmac.h

…

aes_gcm.c

mac80111: aes_gcm: clean up ieee80211_aes_gcm_key_setup_encrypt()

2015-03-30 10:42:02 +02:00

aes_gcm.h

…

aes_gmac.c

mac80211: Fix misplaced return in AES-GMAC key setup

2015-03-30 10:38:07 +02:00

aes_gmac.h

…

agg-rx.c

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

2015-04-02 16:16:53 -04:00

agg-tx.c

mac80211: add an intermediate software queue implementation

2015-04-01 20:44:34 +02:00

cfg.c

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

2015-06-01 22:51:30 -07:00

cfg.h

…

chan.c

mac80211: adjust reserved chan_ctx when assigned to vif

2015-05-07 14:24:52 +02:00

debug.h

…

debugfs_key.c

…

debugfs_key.h

…

debugfs_netdev.c

mac80211: remove drop_unencrypted code

2015-03-20 11:37:36 +01:00

debugfs_netdev.h

…

debugfs_sta.c

mac80211: clean up station debugfs

2015-05-05 14:21:55 +02:00

debugfs_sta.h

…

debugfs.c

mac80211: move dot11 counters under MAC80211_DEBUG_COUNTERS

2015-05-05 14:21:54 +02:00

debugfs.h

…

driver-ops.h

mac80211: extend get_tkip_seq to all keys

2015-05-06 13:29:59 +02:00

ethtool.c

mac80211: remove sta->tx_fragments counter

2015-05-05 14:21:55 +02:00

event.c

…

ht.c

mac80211: add VHT support for IBSS

2015-03-30 10:48:26 +02:00

ibss.c

mac80211: check fast-xmit if IBSS STA QoS changed

2015-05-11 14:01:36 +02:00

ieee80211_i.h

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

2015-06-01 22:51:30 -07:00

iface.c

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

2015-06-01 22:51:30 -07:00

Kconfig

mac80211: move dot11 counters under MAC80211_DEBUG_COUNTERS

2015-05-05 14:21:54 +02:00

key.c

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

2015-06-01 22:51:30 -07:00

key.h

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

2015-06-01 22:51:30 -07: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: prevent possible crypto tx tailroom corruption

2015-05-29 13:04:46 +02:00

Makefile

…

mesh_hwmp.c

…

mesh_pathtbl.c

…

mesh_plink.c

mac80211: introduce plink lock for plink fields

2015-04-20 13:05:29 +02:00

mesh_ps.c

…

mesh_sync.c

…

mesh.c

Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2015-03-31 16:39:04 -04:00

mesh.h

…

michael.c

…

michael.h

…

mlme.c

mac80211: disconnect TDLS stations on STA CSA

2015-05-20 15:14:54 +02:00

ocb.c

…

offchannel.c

…

pm.c

mac80211: start queues if driver rejected wowlan

2015-03-04 10:34:09 +01:00

rate.c

mac80211: lock rate control

2015-04-20 13:05:29 +02:00

rate.h

mac80211: lock rate control

2015-04-20 13:05:29 +02:00

rc80211_minstrel_debugfs.c

mac80211: add standard deviation to Minstrel stats

2015-04-01 20:44:33 +02:00

rc80211_minstrel_ht_debugfs.c

mac80211: add standard deviation to Minstrel stats

2015-04-01 20:44:33 +02:00

rc80211_minstrel_ht.c

mac80211: add max lossless throughput per rate

2015-04-01 20:44:32 +02:00

rc80211_minstrel_ht.h

mac80211: add max lossless throughput per rate

2015-04-01 20:44:32 +02:00

rc80211_minstrel.c

mac80211: add standard deviation to Minstrel stats

2015-04-01 20:44:33 +02:00

rc80211_minstrel.h

mac80211: add standard deviation to Minstrel stats

2015-04-01 20:44:33 +02:00

rx.c

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

2015-06-01 22:51:30 -07:00

scan.c

mac80211: IBSS fix scan request

2015-03-30 10:47:56 +02:00

spectmgmt.c

…

sta_info.c

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

2015-05-13 14:31:43 -04:00

sta_info.h

mac80211: add missing documentation for rate_ctrl_lock

2015-05-06 16:00:32 +02:00

status.c

mac80211: move dot11 counters under MAC80211_DEBUG_COUNTERS

2015-05-05 14:21:54 +02:00

tdls.c

mac80211: disconnect TDLS stations on STA CSA

2015-05-20 15:14:54 +02:00

tkip.c

…

tkip.h

…

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

mac80211: extend get_tkip_seq to all keys

2015-05-06 13:29:59 +02:00

tx.c

mac80211: remove useless skb->encapsulation check

2015-05-05 15:25:33 +02:00

util.c

mac80211: fix AP_VLAN crypto tailroom calculation

2015-05-20 15:10:11 +02:00

vht.c

mac80211: TDLS: support VHT between peers

2015-03-03 15:56:07 +01:00

wep.c

mac80211: move WEP tailroom size check

2015-05-11 14:51:29 +02:00

wep.h

…

wme.c

…

wme.h

…

wpa.c

mac80211: Get IV len from key conf and not cipher scheme

2015-03-17 12:34:26 +01:00

wpa.h

…