Merge tag 'mac80211-for-davem-2019-02-01' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 18:14:12 +0000 (10:14 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 18:14:12 +0000 (10:14 -0800)
commit84826ac7337ed9af8a57c6445773d63d2fbe2fbc
tree25979b7023aabb509c274a5a8aa408d641dd7f89
parent294c149a209c6196c2de85f512b52ef50f519949
parente005bd7ddea06784c1eb91ac5bb6b171a94f3b05
Merge tag 'mac80211-for-davem-2019-02-01' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Two more fixes:
 * sometimes, not enough tailroom was allocated for
   software-encrypted management frames in mac80211
 * cfg80211 regulatory restore got an additional condition,
   needs to rerun the checks after that condition changes
====================

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