From: David S. Miller <davem@davemloft.net>
Date: Wed, 31 Jul 2019 15:51:34 +0000 (-0700)
Subject: Merge tag 'mac80211-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f86a677e5752a0250fef0415c40bbe4af37e8653;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'mac80211-for-davem-2019-07-31' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Just a few fixes:
 * revert NETIF_F_LLTX usage as it caused problems
 * avoid warning on WMM parameters from AP that are too short
 * fix possible null-ptr dereference in hwsim
 * fix interface combinations with 4-addr and crypto control
====================

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

f86a677e5752a0250fef0415c40bbe4af37e8653