diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-02 21:35:31 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-02 21:35:31 +0300 |
| commit | 68df7247f43b925f3e091a55318f76569e0f3187 (patch) | |
| tree | cac9d0dc76e13cceaf0d9f3d92a28bf34cd5ba60 /MAINTAINERS | |
| parent | 768c83a4bc2f709f6f05a1fa89dcaf508f353d0f (diff) | |
| parent | 2af8c4dc2e9c7038aefe9a822aa1df62e2b106b7 (diff) | |
| download | linux-68df7247f43b925f3e091a55318f76569e0f3187.tar.xz | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2fa3303ea625..e6b14f2ead18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6758,6 +6758,7 @@ S: Maintained F: Documentation/networking/mac80211-injection.txt F: include/net/mac80211.h F: net/mac80211/ +F: drivers/net/wireless/mac80211_hwsim.[ch] MACVLAN DRIVER M: Patrick McHardy <kaber@trash.net> |