diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2013-07-23 13:56:50 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-07-23 14:02:08 +0200 |
| commit | cd34f647a78e7f2296fcb72392b9e5c832793e65 (patch) | |
| tree | b6e027bf20bb1d00f060dba3e12fc9b4650c1ab1 /net | |
| parent | 40d18ff959fe8b847be4f7b03f84644a7c18211e (diff) | |
| download | linux-stable-cd34f647a78e7f2296fcb72392b9e5c832793e65.tar.gz linux-stable-cd34f647a78e7f2296fcb72392b9e5c832793e65.tar.bz2 linux-stable-cd34f647a78e7f2296fcb72392b9e5c832793e65.zip | |
mac80211: fix monitor interface suspend crash regression
My commit:
commit 12e7f517029dad819c45eca9ca01fdb9ba57616b
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Thu Feb 28 10:55:26 2013 +0100
mac80211: cleanup generic suspend/resume procedures
removed check for deleting MONITOR and AP_VLAN when suspend. That can
cause a crash (i.e. in iwlagn_mac_remove_interface()) since we remove
interface in the driver that we did not add before.
Reference:
http://marc.info/?l=linux-kernel&m=137391815113860&w=2
Bisected-by: Ortwin Glück <odi@odi.ch>
Reported-and-tested-by: Ortwin Glück <odi@odi.ch>
Cc: stable@vger.kernel.org # 3.10
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/pm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 7fc5d0d8149a..340126204343 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -99,10 +99,13 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) } mutex_unlock(&local->sta_mtx); - /* remove all interfaces */ + /* remove all interfaces that were created in the driver */ list_for_each_entry(sdata, &local->interfaces, list) { - if (!ieee80211_sdata_running(sdata)) + if (!ieee80211_sdata_running(sdata) || + sdata->vif.type == NL80211_IFTYPE_AP_VLAN || + sdata->vif.type == NL80211_IFTYPE_MONITOR) continue; + drv_remove_interface(local, sdata); } |