diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-07-31 08:51:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-31 08:51:34 -0700 |
| commit | f86a677e5752a0250fef0415c40bbe4af37e8653 (patch) | |
| tree | b2d8bdc8fb991528b2bd93e264fd65d3d427b03f /net/l3mdev | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff) | |
| parent | Revert "mac80211: set NETIF_F_LLTX when using intermediate tx queues" (diff) | |
| download | linux-dev-f86a677e5752a0250fef0415c40bbe4af37e8653.tar.xz linux-dev-f86a677e5752a0250fef0415c40bbe4af37e8653.zip | |
Merge tag 'mac80211-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/l3mdev')
0 files changed, 0 insertions, 0 deletions