Johannes Berg 72bbe3d1c2 Merge branch 'mac80211' into mac80211-next ... This is necessary to merge the new TDLS and mesh patches, as they depend on some fixes. Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2015-07-17 15:39:41 +02:00
..
aes_ccm.c	mac80211: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
aes_ccm.h
aes_cmac.c
aes_cmac.h
aes_gcm.c	mac80211: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
aes_gcm.h
aes_gmac.c	mac80211: Switch to new AEAD interface	2015-05-28 11:23:20 +08:00
aes_gmac.h
agg-rx.c
agg-tx.c	mac80211: convert HW flags to unsigned long bitmap	2015-06-10 16:05:36 +02:00
cfg.c	mac80211: TDLS: correctly configure SMPS state	2015-07-17 15:38:18 +02:00
cfg.h
chan.c	mac80211: upgrade BW of TDLS peers when possible	2015-07-17 15:38:12 +02:00
debug.h
debugfs.c	mac80211: define TDLS wider BW support bits	2015-07-17 15:38:11 +02:00
debugfs.h
debugfs_key.c	mac80211: remove key TX/RX counter	2015-07-17 15:38:01 +02:00
debugfs_key.h
debugfs_netdev.c	mac80211: clear subdir_stations when removing debugfs	2015-07-17 10:53:19 +02:00
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
driver-ops.h	mac80211: convert HW flags to unsigned long bitmap	2015-06-10 16:05:36 +02:00
ethtool.c
event.c
ht.c
ibss.c	mac80211: fix the beacon csa counter for mesh and ibss	2015-06-09 22:04:25 +02:00
ieee80211_i.h	mac80211: Add support for declaring MU-MIMO capability	2015-07-17 15:38:29 +02:00
iface.c	mac80211: shut down interfaces before destroying interface list	2015-07-17 11:16:26 +02:00
Kconfig
key.c	mac80211: remove sta_info.gtk_idx	2015-07-17 15:37:54 +02:00
key.h	mac80211: remove key TX/RX counter	2015-07-17 15:38:01 +02:00
led.c
led.h
main.c	mac80211: don't store napi struct	2015-07-17 15:37:59 +02:00
Makefile
mesh.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
mesh.h
mesh_hwmp.c	mac80211: mesh: move fail_avg into mesh struct	2015-07-17 15:38:24 +02:00
mesh_pathtbl.c
mesh_plink.c	Merge branch 'mac80211' into mac80211-next	2015-07-17 15:39:41 +02:00
mesh_ps.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
mesh_sync.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
michael.c
michael.h
mlme.c	mac80211: Add support for declaring MU-MIMO capability	2015-07-17 15:38:29 +02:00
ocb.c
offchannel.c	mac80211: convert HW flags to unsigned long bitmap	2015-06-10 16:05:36 +02:00
pm.c	mac80211: wowlan: enable powersave if suspend while ps-polling	2015-07-17 11:13:21 +02:00
rate.c	Minor merge needed, due to function move.	2015-07-01 10:49:25 -07:00
rate.h
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht.c	mac80211: minstrel_ht: handle peers in dynamic SMPS	2015-07-17 15:38:20 +02:00
rc80211_minstrel_ht.h
rc80211_minstrel_ht_debugfs.c
rx.c	mac80211: remove IEEE80211_RX_FRAGMENTED	2015-07-17 15:38:04 +02:00
scan.c	mac80211: convert HW flags to unsigned long bitmap	2015-06-10 16:05:36 +02:00
spectmgmt.c
sta_info.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
sta_info.h	mac80211: mesh: move fail_avg into mesh struct	2015-07-17 15:38:24 +02:00
status.c	mac80211: convert HW flags to unsigned long bitmap	2015-06-10 16:05:36 +02:00
tdls.c	Merge branch 'mac80211' into mac80211-next	2015-07-17 15:39:41 +02:00
tkip.c
tkip.h
trace.c
trace.h
trace_msg.h
tx.c	Merge branch 'mac80211' into mac80211-next	2015-07-17 15:39:41 +02:00
util.c	mac80211: clear local->in_reconfig on reconfig error	2015-07-17 15:38:10 +02:00
vht.c	mac80211: define TDLS wider BW support bits	2015-07-17 15:38:11 +02:00
wep.c
wep.h
wme.c
wme.h
wpa.c	mac80211: support device/driver PN check for CCMP/GCMP	2015-07-17 15:38:02 +02:00
wpa.h