Merge tag 'mac80211-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Wed, 31 Jul 2019 15:51:34 +0000 (08:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 31 Jul 2019 15:51:34 +0000 (08:51 -0700)
commitf86a677e5752a0250fef0415c40bbe4af37e8653
treeb2d8bdc8fb991528b2bd93e264fd65d3d427b03f
parentfa9586aff919a93761a76feb69718b54d49fdd8e
parenteef347f846ee8f7296a6f84e3866c057ca6bcce0
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>