diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-02-14 07:16:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-14 07:16:08 -0800 |
| commit | b32cb6fcf1f81449a388f3fd2be14454a2c644da (patch) | |
| tree | 8f1341a2efeab11e0bbe263cba47085cbfeea8f0 /net/mac80211/cfg.c | |
| parent | Merge branch 'smc-fixes' (diff) | |
| parent | mac80211: fix wrong 160/80+80 MHz setting (diff) | |
| download | linux-dev-b32cb6fcf1f81449a388f3fd2be14454a2c644da.tar.xz linux-dev-b32cb6fcf1f81449a388f3fd2be14454a2c644da.zip | |
Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just a few fixes:
* avoid running out of tracking space for frames that need
to be reported to userspace by using more bits
* fix beacon handling suppression by adding some relevant
elements to the CRC calculation
* fix quiet mode in action frames
* fix crash in ethtool for virt_wifi and similar
* add a missing policy entry
* fix 160 & 80+80 bandwidth to take local capabilities into
account
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 000c742d0527..6aee699deb28 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3450,7 +3450,7 @@ int ieee80211_attach_ack_skb(struct ieee80211_local *local, struct sk_buff *skb, spin_lock_irqsave(&local->ack_status_lock, spin_flags); id = idr_alloc(&local->ack_status_frames, ack_skb, - 1, 0x40, GFP_ATOMIC); + 1, 0x2000, GFP_ATOMIC); spin_unlock_irqrestore(&local->ack_status_lock, spin_flags); if (id < 0) { |