diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-11 20:15:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-11 20:15:01 +0300 |
| commit | df2fd38a08272fcc2c658f2c4d7d6318e8da593e (patch) | |
| tree | 0573548f36917a3af84d571cac557da6f5eab032 /MAINTAINERS | |
| parent | b8226962b1c49c784aeddb9d2fafbf53dfdc2190 (diff) | |
| parent | 90a53e4432b12288316efaa5f308adafb8d304b0 (diff) | |
| download | linux-df2fd38a08272fcc2c658f2c4d7d6318e8da593e.tar.xz | |
Merge tag 'mac80211-next-for-davem-2017-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Work continues in various areas:
* port authorized event for 4-way-HS offload (Avi)
* enable MFP optional for such devices (Emmanuel)
* Kees's timer setup patch for mac80211 mesh
(the part that isn't trivially scripted)
* improve VLAN vs. TXQ handling (myself)
* load regulatory database as firmware file (myself)
* with various other small improvements and cleanups
I merged net-next once in the meantime to allow Kees's
timer setup patch to go in.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41f6690526cd..3944f1626911 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3329,17 +3329,22 @@ S: Maintained F: drivers/auxdisplay/cfag12864bfb.c F: include/linux/cfag12864b.h -CFG80211 and NL80211 +802.11 (including CFG80211/NL80211) M: Johannes Berg <johannes@sipsolutions.net> L: linux-wireless@vger.kernel.org W: http://wireless.kernel.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git S: Maintained +F: net/wireless/ F: include/uapi/linux/nl80211.h +F: include/linux/ieee80211.h +F: include/net/wext.h F: include/net/cfg80211.h -F: net/wireless/* -X: net/wireless/wext* +F: include/net/iw_handler.h +F: include/net/ieee80211_radiotap.h +F: Documentation/driver-api/80211/cfg80211.rst +F: Documentation/networking/regulatory.txt CHAR and MISC DRIVERS M: Arnd Bergmann <arnd@arndb.de> @@ -8208,6 +8213,7 @@ F: Documentation/networking/mac80211-injection.txt F: include/net/mac80211.h F: net/mac80211/ F: drivers/net/wireless/mac80211_hwsim.[ch] +F: Documentation/networking/mac80211_hwsim/README MAILBOX API M: Jassi Brar <jassisinghbrar@gmail.com> @@ -11492,6 +11498,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git S: Maintained F: Documentation/rfkill.txt +F: Documentation/ABI/stable/sysfs-class-rfkill F: net/rfkill/ RHASHTABLE |