Johannes Berg 3a4b0c948d Merge branch 'mac80211' into mac80211-next ...

Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2015-01-07 14:39:16 +01:00

..

aes_ccm.c

mac80211: Fix regression that triggers a kernel BUG with CCMP

2014-11-06 12:42:22 +01:00

aes_ccm.h

…

aes_cmac.c

…

aes_cmac.h

…

agg-rx.c

mac80211: fix offloaded BA session traffic after hw restart

2014-09-03 13:40:38 +02:00

agg-tx.c

mac80211: synchronously reserve TID per station

2014-11-19 18:45:36 +01:00

cfg.c

mac80211: ask driver to look at power level when starting AP

2014-12-15 12:27:02 +01:00

cfg.h

…

chan.c

mac80211: update the channel context after channel switch

2014-12-12 12:35:38 +01:00

debug.h

mac80211: 802.11p OCB mode support

2014-11-04 13:18:21 +01:00

debugfs_key.c

mac80211: remove unnecessary null test before debugfs_remove()

2014-10-21 21:08:10 +02:00

debugfs_key.h

…

debugfs_netdev.c

mac80211: replace SMPS hw flags with wiphy feature bits

2014-09-11 13:37:02 +02:00

debugfs_netdev.h

…

debugfs_sta.c

mac80211: introduce TDLS channel switch ops

2014-11-19 18:45:21 +01:00

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: notify drivers on sta rate table changes

2014-11-19 19:15:50 +01:00

ethtool.c

…

event.c

…

ht.c

…

ibss.c

mac80211: notify NSS changed when IBSS and HT

2014-12-17 11:47:26 +01:00

ieee80211_i.h

mac80211: update sta bw on ht chanwidth action frame

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

iface.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2014-12-04 11:29:10 -05:00

Kconfig

mac80211: 802.11p OCB mode support

2014-11-04 13:18:21 +01:00

key.c

Revert "mac80211: Fix accounting of the tailroom-needed counter"

2015-01-05 10:33:46 +01:00

key.h

…

led.c

…

led.h

…

main.c

mac80211: move U-APSD enablement to vif flags

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

Makefile

mac80211: 802.11p OCB mode support

2014-11-04 13:18:21 +01:00

mesh_hwmp.c

…

mesh_pathtbl.c

mac80211: implement cfg80211_ops to query mesh proxy path table

2014-10-09 11:19:07 +02:00

mesh_plink.c

mac80211: keep sending peer candidate events while in listen state

2014-12-17 11:49:24 +01:00

mesh_ps.c

…

mesh_sync.c

…

mesh.c

mac80211: use secondary channel offset IE also beacons during CSA

2014-10-29 16:37:45 +01:00

mesh.h

mac80211: implement cfg80211_ops to query mesh proxy path table

2014-10-09 11:19:07 +02:00

michael.c

…

michael.h

…

mlme.c

Merge branch 'mac80211' into mac80211-next

2015-01-07 14:39:16 +01:00

ocb.c

mac80211: 802.11p OCB mode support

2014-11-04 13:18:21 +01:00

offchannel.c

…

pm.c

…

rate.c

mac80211: add more missing checks for VHT tx rates

2014-11-28 14:24:23 +01:00

rate.h

mac80211: add ieee80211_tx_status_noskb

2014-11-28 15:01:51 +01:00

rc80211_minstrel_debugfs.c

mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats

2014-10-20 16:37:01 +02:00

rc80211_minstrel_ht_debugfs.c

mac80211: minstrel_ht: use group flags instead of index to display rates

2014-10-23 20:36:13 +02:00

rc80211_minstrel_ht.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2014-12-08 13:58:58 -05:00

rc80211_minstrel_ht.h

mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz

2014-10-21 13:25:26 +02:00

rc80211_minstrel.c

mac80211: minstrel: reduce size of struct minstrel_rate_stats

2014-12-19 21:34:22 +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 branch 'mac80211' into mac80211-next

2015-01-07 14:39:16 +01:00

scan.c

mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR

2014-11-19 18:46:09 +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: Move IEEE80211_TX_CTL_PS_RESPONSE

2014-12-12 13:48:26 +01:00

sta_info.h

mac80211: synchronously reserve TID per station

2014-11-19 18:45:36 +01:00

status.c

mac80211: fix dot11MulticastTransmittedFrameCount tested address

2014-12-23 10:16:43 +01:00

tdls.c

mac80211: add TDLS channel-switch Rx flow

2014-11-19 18:45:26 +01:00

tkip.c

…

tkip.h

…

trace.c

…

trace.h

cfg80211: clean up beacon loss CQM event

2014-11-26 20:56:42 +01:00

tx.c

mac80211: add more missing checks for VHT tx rates

2014-11-28 14:24:23 +01:00

util.c

mac80211: skip disabled channels in VHT check

2015-01-06 14:59:07 +01:00

vht.c

mac80211: update sta bw on ht chanwidth action frame

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

wep.c

mac80211: fix network header breakage during encryption

2014-10-23 20:40:01 +02:00

wep.h

…

wme.c

mac80211: synchronously reserve TID per station

2014-11-19 18:45:36 +01:00

wme.h

mac80211: add WMM admission control support

2014-10-22 10:42:09 +02:00

wpa.c

mac80211: fix network header breakage during encryption

2014-10-23 20:40:01 +02:00

wpa.h

…