From: David S. Miller <davem@davemloft.net>
Date: Tue, 1 Mar 2016 22:02:30 +0000 (-0500)
Subject: Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~8298^2~159
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d67703fcede6696667218d29f86b4ee6ae618de6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Johannes Berg says:

====================
Here's another round of updates for -next:
 * big A-MSDU RX performance improvement (avoid linearize of paged RX)
 * rfkill changes: cleanups, documentation, platform properties
 * basic PBSS support in cfg80211
 * MU-MIMO action frame processing support
 * BlockAck reordering & duplicate detection offload support
 * various cleanups & little fixes
====================

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

d67703fcede6696667218d29f86b4ee6ae618de6
diff --cc net/mac80211/debugfs.c
index 3e24d0ddb51b,e433d0c97e86..4ab5c522ceee
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@@ -126,6 -126,10 +126,7 @@@ static const char *hw_flag_names[] = 
  	FLAG(SUPPORTS_AMSDU_IN_AMPDU),
  	FLAG(BEACON_TX_STATUS),
  	FLAG(NEEDS_UNIQUE_STA_ADDR),
+ 	FLAG(SUPPORTS_REORDERING_BUFFER),
 -
 -	/* keep last for the build bug below */
 -	(void *)0x1
  #undef FLAG
  };