Merge tag 'mac80211-next-for-davem-2018-02-22' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Feb 2018 20:18:28 +0000 (15:18 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Feb 2018 20:18:28 +0000 (15:18 -0500)
commit60772e48ec417c5455ff04454b94fd68466f2c73
tree7b80f73766fe73a7a03f3972144413efaeb87c2a
parent82e3be320d1e38a5e91a79d0eb451954c87ab7fe
parent94ba92713f8329c96e0a8e2880b3c1a785d1c95c
Merge tag 'mac80211-next-for-davem-2018-02-22' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Various updates across wireless.

One thing to note: I've included a new ethertype
that wireless uses (ETH_P_PREAUTH) in if_ether.h.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/if_ether.h
net/wireless/nl80211.c