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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

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

2015-03-03 21:16:48 -05:00

..

aes_ccm.c

mac80111: Add CCMP-256 cipher

2015-01-27 11:07:35 +01:00

aes_ccm.h

mac80111: Add CCMP-256 cipher

2015-01-27 11:07:35 +01:00

aes_cmac.c

mac80111: Add BIP-CMAC-256 cipher

2015-01-27 11:09:13 +01:00

aes_cmac.h

mac80111: Add BIP-CMAC-256 cipher

2015-01-27 11:09:13 +01:00

aes_gcm.c

mac80111: Add GCMP and GCMP-256 ciphers

2015-01-27 11:06:09 +01:00

aes_gcm.h

mac80111: Add GCMP and GCMP-256 ciphers

2015-01-27 11:06:09 +01:00

aes_gmac.c

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01: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

…

agg-tx.c

…

cfg.c

mac80211: Use eth_<foo>_addr instead of memset

2015-03-03 17:01:38 -05:00

cfg.h

…

chan.c

mac80211: clear sdata->radar_required

2015-02-24 10:51:06 +01:00

debug.h

…

debugfs_key.c

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00

debugfs_key.h

…

debugfs_netdev.c

…

debugfs_netdev.h

…

debugfs_sta.c

…

debugfs_sta.h

…

debugfs.c

mac80211: move U-APSD enablement to vif flags

2014-12-15 12:34:45 +01:00

debugfs.h

…

driver-ops.h

mac80211: allow drivers to provide most station statistics

2015-01-08 15:28:06 +01:00

ethtool.c

cfg80211: remove enum station_info_flags

2015-01-08 15:28:10 +01:00

event.c

…

ht.c

…

ibss.c

mac80211: Use eth_<foo>_addr instead of memset

2015-03-03 17:01:38 -05:00

ieee80211_i.h

mac80211: handle potential race between suspend and scan completion

2015-01-27 09:58:46 +01:00

iface.c

mac80211: avoid races related to suspend flow

2015-01-23 10:54:22 +01:00

Kconfig

mac80111: Add GCMP and GCMP-256 ciphers

2015-01-27 11:06:09 +01:00

key.c

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00

key.h

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00

led.c

…

led.h

…

main.c

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00

Makefile

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00

mesh_hwmp.c

…

mesh_pathtbl.c

…

mesh_plink.c

Revert "mac80211: keep sending peer candidate events while in listen state"

2015-01-23 10:57:19 +01:00

mesh_ps.c

…

mesh_sync.c

…

mesh.c

mac80211: Use eth_<foo>_addr instead of memset

2015-03-03 17:01:38 -05:00

mesh.h

…

michael.c

…

michael.h

…

mlme.c

mac80211: Use eth_<foo>_addr instead of memset

2015-03-03 17:01:38 -05:00

ocb.c

…

offchannel.c

mac80211: let flush() drop packets when possible

2015-01-14 09:31:18 +01:00

pm.c

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

2015-01-27 16:59:56 -08:00

rate.c

…

rate.h

…

rc80211_minstrel_debugfs.c

…

rc80211_minstrel_ht_debugfs.c

…

rc80211_minstrel_ht.c

…

rc80211_minstrel_ht.h

…

rc80211_minstrel.c

mac80211/minstrel: fix !x!=0 confusion

2015-02-24 21:12:07 +01:00

rc80211_minstrel.h

mac80211: minstrel: reduce size of struct minstrel_rate_stats

2014-12-19 21:34:22 +01:00

rx.c

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

2015-02-04 14:57:45 -08:00

scan.c

mac80211: complete scan work immediately if quiesced or suspended

2015-01-23 10:54:22 +01:00

spectmgmt.c

mac80211: remove unused variable in ieee80211_parse_ch_switch_ie()

2014-12-17 15:45:17 +01:00

sta_info.c

mac80211: support beacon statistics

2015-01-23 15:51:38 +01:00

sta_info.h

mac80211: provide per-TID RX/TX MSDU counters

2015-01-08 15:28:20 +01:00

status.c

mac80211: remove doubled semicolon

2015-01-16 13:27:56 +01:00

tdls.c

mac80211: tdls: disentangle HT supported conditions

2015-01-23 11:42:14 +01:00

tkip.c

…

tkip.h

…

trace.c

…

trace.h

mac80211: allow drivers to provide most station statistics

2015-01-08 15:28:06 +01:00

tx.c

mac80211: Send EAPOL frames at lowest rate

2015-02-26 21:03:06 +01:00

util.c

mac80211: handle potential race between suspend and scan completion

2015-01-27 09:58:46 +01:00

vht.c

mac80211: update sta bw on ht chanwidth action frame

2014-12-17 15:45:16 +01:00

wep.c

…

wep.h

…

wme.c

…

wme.h

…

wpa.c

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00

wpa.h

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers

2015-01-27 11:10:13 +01:00