]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Sat, 30 Jun 2018 12:08:12 +0000 (21:08 +0900)
committerDavid S. Miller <davem@davemloft.net>
Sat, 30 Jun 2018 12:08:12 +0000 (21:08 +0900)
commitbcd3b3bdd397c15ea20e976475694d570f91500b
tree223ab9641411c401269e5da80f260cafaf40eedc
parent05370b20ddc57d76ae82b1a692225b4a5b84e891
parent11df842f9283cf092ba9617d1eb33415cc11eac2
Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Small merge conflict in net/mac80211/scan.c, I preserved
the kcalloc() conversion. -DaveM

Johannes Berg says:

====================
This round's updates:
 * finally some of the promised HE code, but it turns
   out to be small - but everything kept changing, so
   one part I did in the driver was >30 patches for
   what was ultimately <200 lines of code ... similar
   here for this code.
 * improved scan privacy support - can now specify scan
   flags for randomizing the sequence number as well as
   reducing the probe request element content
 * rfkill cleanups
 * a timekeeping cleanup from Arnd
 * various other cleanups
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
include/uapi/linux/nl80211.h
net/mac80211/main.c
net/mac80211/scan.c
net/mac80211/util.c
net/wireless/core.c
net/wireless/nl80211.c
net/wireless/util.c