From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Feb 2018 20:17:01 +0000 (-0500)
Subject: Merge tag 'mac80211-for-davem-2018-02-22' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.16-rc3~8^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ed04c46d4e70007e102d88dd2ee648008f7f634d;p=linux-2.6-block.git

Merge tag 'mac80211-for-davem-2018-02-22' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Various fixes across the tree, the shortlog basically says it all:

  cfg80211: fix cfg80211_beacon_dup
  -> old bug in this code

  cfg80211: clear wep keys after disconnection
  -> certain ways of disconnecting left the keys

  mac80211: round IEEE80211_TX_STATUS_HEADROOM up to multiple of 4
  -> alignment issues with using 14 bytes

  mac80211: Do not disconnect on invalid operating class
  -> if the AP has a bogus operating class, let it be

  mac80211: Fix sending ADDBA response for an ongoing session
  -> don't send the same frame twice

  cfg80211: use only 1Mbps for basic rates in mesh
  -> interop issue with old versions of our code

  mac80211_hwsim: don't use WQ_MEM_RECLAIM
  -> it causes splats because it flushes work on a non-reclaim WQ

  regulatory: add NUL to request alpha2
  -> nla_put_string() issue from Kees

  mac80211: mesh: fix wrong mesh TTL offset calculation
  -> protocol issue

  mac80211: fix a possible leak of station stats
  -> error path might leak memory

  mac80211: fix calling sleeping function in atomic context
  -> percpu allocations need to be made with gfp flags
====================

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

ed04c46d4e70007e102d88dd2ee648008f7f634d
diff --cc drivers/net/wireless/mac80211_hwsim.c
index 1cf22e62e3dd,829ac22b72fc..6e0af815f25e
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@@ -3516,10 -3455,9 +3516,10 @@@ static int __init init_mac80211_hwsim(v
  
  	spin_lock_init(&hwsim_radio_lock);
  
- 	hwsim_wq = alloc_workqueue("hwsim_wq",WQ_MEM_RECLAIM,0);
+ 	hwsim_wq = alloc_workqueue("hwsim_wq", 0, 0);
  	if (!hwsim_wq)
  		return -ENOMEM;
 +	rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);
  
  	err = register_pernet_device(&hwsim_net_ops);
  	if (err)