diff options
author | David S. Miller | 2016-03-02 19:35:31 +0100 |
---|---|---|
committer | David S. Miller | 2016-03-02 19:35:31 +0100 |
commit | 68df7247f43b925f3e091a55318f76569e0f3187 (patch) | |
tree | cac9d0dc76e13cceaf0d9f3d92a28bf34cd5ba60 /net/core/gen_stats.c | |
parent | Merge branch 'bnx2x-fixes' (diff) | |
parent | mac80211_hwsim: treat as part of mac80211 for MAINTAINERS (diff) | |
download | kernel-qcow2-linux-68df7247f43b925f3e091a55318f76569e0f3187.tar.gz kernel-qcow2-linux-68df7247f43b925f3e091a55318f76569e0f3187.tar.xz kernel-qcow2-linux-68df7247f43b925f3e091a55318f76569e0f3187.zip |
Merge tag 'mac80211-for-davem-2016-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Here are a few more fixes for the current cycle:
* check GCMP encryption vs. fragmentation properly; we'd found
this problem quite a while ago but waited for the 802.11 spec
to be updated
* fix RTS/CTS logic in minstrel_ht
* fix RX of certain public action frames in AP mode
* add mac80211_hwsim to MAC80211 in MAINTAINERS, this helps
the kbuild robot pick up the right tree for it
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/gen_stats.c')
0 files changed, 0 insertions, 0 deletions