|
 |
8743f38 |
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
|
|
|
caf64a2 |
index baaa860..7a3d675 100644
|
|
|
8743f38 |
--- a/net/mac80211/iface.c
|
|
|
8743f38 |
+++ b/net/mac80211/iface.c
|
|
|
8743f38 |
@@ -748,8 +748,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
|
|
|
8743f38 |
sdata->dev->addr_len);
|
|
|
8743f38 |
spin_unlock_bh(&local->filter_lock);
|
|
|
8743f38 |
netif_addr_unlock_bh(sdata->dev);
|
|
|
8743f38 |
-
|
|
|
8743f38 |
- ieee80211_configure_filter(local);
|
|
|
8743f38 |
+ /* configure filter latter (if not suspended) */
|
|
|
8743f38 |
}
|
|
|
8743f38 |
|
|
|
8743f38 |
del_timer_sync(&local->dynamic_ps_timer);
|
|
|
8743f38 |
@@ -814,10 +813,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
|
|
|
8743f38 |
}
|
|
|
8743f38 |
|
|
|
8743f38 |
ieee80211_adjust_monitor_flags(sdata, -1);
|
|
|
8743f38 |
- ieee80211_configure_filter(local);
|
|
|
8743f38 |
- mutex_lock(&local->mtx);
|
|
|
8743f38 |
- ieee80211_recalc_idle(local);
|
|
|
8743f38 |
- mutex_unlock(&local->mtx);
|
|
|
8743f38 |
+ /* tell driver latter (if not suspended) */
|
|
|
8743f38 |
break;
|
|
|
8743f38 |
case NL80211_IFTYPE_P2P_DEVICE:
|
|
|
8743f38 |
/* relies on synchronize_rcu() below */
|
|
|
caf64a2 |
@@ -848,28 +844,31 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
|
|
|
8743f38 |
|
|
|
8743f38 |
drv_remove_interface_debugfs(local, sdata);
|
|
|
8743f38 |
|
|
|
8743f38 |
- if (going_down)
|
|
|
8743f38 |
+ if (going_down && !local->suspended)
|
|
|
8743f38 |
drv_remove_interface(local, sdata);
|
|
|
8743f38 |
}
|
|
|
8743f38 |
|
|
|
8743f38 |
sdata->bss = NULL;
|
|
|
8743f38 |
|
|
|
8743f38 |
- ieee80211_recalc_ps(local, -1);
|
|
|
8743f38 |
-
|
|
|
8743f38 |
- if (local->open_count == 0) {
|
|
|
8743f38 |
- if (local->ops->napi_poll)
|
|
|
8743f38 |
- napi_disable(&local->napi);
|
|
|
8743f38 |
- ieee80211_clear_tx_pending(local);
|
|
|
8743f38 |
- ieee80211_stop_device(local);
|
|
|
8743f38 |
-
|
|
|
8743f38 |
- /* no reconfiguring after stop! */
|
|
|
8743f38 |
- hw_reconf_flags = 0;
|
|
|
8743f38 |
+ if (!local->suspended) {
|
|
|
8743f38 |
+ if (local->open_count == 0) {
|
|
|
8743f38 |
+ if (local->ops->napi_poll)
|
|
|
8743f38 |
+ napi_disable(&local->napi);
|
|
|
8743f38 |
+ ieee80211_clear_tx_pending(local);
|
|
|
8743f38 |
+ ieee80211_stop_device(local);
|
|
|
8743f38 |
+ } else {
|
|
|
8743f38 |
+ ieee80211_configure_filter(local);
|
|
|
8743f38 |
+ ieee80211_recalc_ps(local, -1);
|
|
|
8743f38 |
+
|
|
|
8743f38 |
+ mutex_lock(&local->mtx);
|
|
|
8743f38 |
+ ieee80211_recalc_idle(local);
|
|
|
8743f38 |
+ mutex_unlock(&local->mtx);
|
|
|
8743f38 |
+
|
|
|
8743f38 |
+ if (hw_reconf_flags)
|
|
|
8743f38 |
+ ieee80211_hw_config(local, hw_reconf_flags);
|
|
|
caf64a2 |
+ }
|
|
|
8743f38 |
}
|
|
|
8743f38 |
|
|
|
8743f38 |
- /* do after stop to avoid reconfiguring when we stop anyway */
|
|
|
8743f38 |
- if (hw_reconf_flags)
|
|
|
8743f38 |
- ieee80211_hw_config(local, hw_reconf_flags);
|
|
|
8743f38 |
-
|
|
|
8743f38 |
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
8743f38 |
for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
|
|
|
8743f38 |
skb_queue_walk_safe(&local->pending[i], skb, tmp) {
|