From: David S. Miller <davem@davemloft.net>
Date: Mon, 6 Feb 2017 15:55:08 +0000 (-0500)
Subject: Merge tag 'mac80211-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=89389b4d5524350e74974cf711fe4a18206c09d3;p=linux-beck.git

Merge tag 'mac80211-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
A few simple fixes:
 * fix FILS AEAD cipher usage to use the correct AAD vectors
   and to use synchronous algorithms
 * fix using mesh HT operation data from userspace
 * fix adding mesh vendor elements to beacons & plink frames
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

89389b4d5524350e74974cf711fe4a18206c09d3