diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-04-30 14:19:04 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-09 12:21:34 +0200 |
| commit | f6837ba8c98afcf28ec25f6863a8597274aeefd6 (patch) | |
| tree | 25e045970c4161b73457e42ded044dd908e81c6c /net/wireless/core.c | |
| parent | f29f58a9e53252a50eaea0ece59f1af5fad56b5f (diff) | |
| download | linux-0-day-f6837ba8c98afcf28ec25f6863a8597274aeefd6.tar.gz linux-0-day-f6837ba8c98afcf28ec25f6863a8597274aeefd6.tar.xz | |
mac80211: handle failed restart/resume better
When the driver fails during HW restart or resume, the whole
stack goes into a very confused state with interfaces being
up while the hardware is down etc.
Address this by shutting down everything; we'll run into a
lot of warnings in the process but that's better than having
the whole stack get messed up.
Reviewed-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 7e023b74f0098..39788711ce6e4 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -210,15 +210,12 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, } } -static int cfg80211_rfkill_set_block(void *data, bool blocked) +void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy) { - struct cfg80211_registered_device *rdev = data; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); struct wireless_dev *wdev; - if (!blocked) - return 0; - - rtnl_lock(); + ASSERT_RTNL(); list_for_each_entry(wdev, &rdev->wdev_list, list) { if (wdev->netdev) { @@ -234,7 +231,18 @@ static int cfg80211_rfkill_set_block(void *data, bool blocked) break; } } +} +EXPORT_SYMBOL_GPL(cfg80211_shutdown_all_interfaces); +static int cfg80211_rfkill_set_block(void *data, bool blocked) +{ + struct cfg80211_registered_device *rdev = data; + + if (!blocked) + return 0; + + rtnl_lock(); + cfg80211_shutdown_all_interfaces(&rdev->wiphy); rtnl_unlock(); return 0; |