From: Greg Kroah-Hartman Date: Wed, 24 Apr 2019 14:10:55 +0000 (+0200) Subject: drop broken 3.18 mac80211 patch X-Git-Tag: v3.18.139~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dd70c8ff71fb92124d3e55230bcf896bb81660e;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken 3.18 mac80211 patch --- diff --git a/queue-3.18/mac80211-do-not-call-driver-wake_tx_queue-op-during-reconfig.patch b/queue-3.18/mac80211-do-not-call-driver-wake_tx_queue-op-during-reconfig.patch deleted file mode 100644 index 1a45419e521..00000000000 --- a/queue-3.18/mac80211-do-not-call-driver-wake_tx_queue-op-during-reconfig.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4856bfd230985e43e84c26473c91028ff0a533bd Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 1 Mar 2019 14:48:37 +0100 -Subject: mac80211: do not call driver wake_tx_queue op during reconfig - -From: Felix Fietkau - -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 -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - net/mac80211/driver-ops.h | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/net/mac80211/driver-ops.h -+++ b/net/mac80211/driver-ops.h -@@ -1122,6 +1122,9 @@ static inline int drv_start_ap(struct ie - { - int ret = 0; - -+ if (local->in_reconfig) -+ return; -+ - if (!check_sdata_in_driver(sdata)) - return -EIO; - diff --git a/queue-3.18/series b/queue-3.18/series index 04ca2e4c037..0a844395440 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -100,6 +100,5 @@ staging-comedi-ni_usb6501-fix-possible-double-free-of-usb_rx_buf.patch alsa-core-fix-card-races-between-register-and-disconnect.patch x86-kprobes-verify-stack-frame-on-kretprobe.patch kprobes-fix-error-check-when-reusing-optimized-probes.patch -mac80211-do-not-call-driver-wake_tx_queue-op-during-reconfig.patch sched-fair-limit-sched_cfs_period_timer-loop-to-avoi.patch device_cgroup-fix-rcu-imbalance-in-error-case.patch