summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-16 16:17:48 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-16 16:17:48 -0400
commit48b810d9bc4a3ea1baff44fa7f553833dd69b836 (patch)
treec3d8f7deb6114222dbf7a4d102544c4d5d9ae4f8 /drivers/net
parentca00942a81bb5869131d53c411b34491233181ab (diff)
parentf84eaa1068315409ffbef57e6fea312180787db3 (diff)
downloadlinux-48b810d9bc4a3ea1baff44fa7f553833dd69b836.tar.gz
linux-48b810d9bc4a3ea1baff44fa7f553833dd69b836.tar.bz2
linux-48b810d9bc4a3ea1baff44fa7f553833dd69b836.zip
Merge tag 'mac80211-for-davem-2015-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== Here are a few fixes that I'd like to still get in: * disable U-APSD for better interoperability, from Michal Kazior * drop unencrypted frames in mesh forwarding, from Bob Copeland * treat non-QoS/WMM HT stations as non-HT, to fix confusion when they connect and then get QoS packets anyway due to HT * fix counting interfaces for combination checks, otherwise the interface combinations aren't properly enforced (from Andrei) * fix pure ECSA by reacting to the IE change * ignore erroneous (E)CSA to the current channel which sometimes happens due to AP/GO bugs ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions