diff options
| author | Felix Fietkau | 2019-03-01 14:48:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-27 09:36:38 +0200 |
| commit | 39cad03c4360b72d4d4adda4be1b718c24d0af44 (patch) | |
| tree | 6a4413b7c259b8521934cb8857d100487e3d33c6 /net/mac80211 | |
| parent | rt2x00: do not increment sequence number while re-transmitting (diff) | |
| download | kernel-qcow2-linux-39cad03c4360b72d4d4adda4be1b718c24d0af44.tar.gz kernel-qcow2-linux-39cad03c4360b72d4d4adda4be1b718c24d0af44.tar.xz kernel-qcow2-linux-39cad03c4360b72d4d4adda4be1b718c24d0af44.zip | |
mac80211: do not call driver wake_tx_queue op during reconfig
commit 4856bfd230985e43e84c26473c91028ff0a533bd upstream.
There are several scenarios in which mac80211 can call drv_wake_tx_queue
after ieee80211_restart_hw has been called and has not yet completed.
Driver private structs are considered uninitialized until mac80211 has
uploaded the vifs, stations and keys again, so using private tx queue
data during that time is not safe.
The driver can also not rely on drv_reconfig_complete to figure out when
it is safe to accept drv_wake_tx_queue calls again, because it is only
called after all tx queues are woken again.
To fix this, bail out early in drv_wake_tx_queue if local->in_reconfig
is set.
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/driver-ops.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 8f6998091d26..2123f6e90fc0 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -1166,6 +1166,9 @@ static inline void drv_wake_tx_queue(struct ieee80211_local *local, { struct ieee80211_sub_if_data *sdata = vif_to_sdata(txq->txq.vif); + if (local->in_reconfig) + return; + if (!check_sdata_in_driver(sdata)) return; |