Attachment 709072 Details for Bug 892599 – mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.8.patch

mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.8.patch

mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.8.patch (text/plain), 2.07 KB, created by Stanislaw Gruszka on 2013-03-12 16:33:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2013-03-12 16:33:21 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
>index 8be854e..6d2bab7 100644
>--- a/net/mac80211/iface.c
>+++ b/net/mac80211/iface.c
>@@ -605,7 +605,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
> 		}
> 
> 		ieee80211_adjust_monitor_flags(sdata, 1);
>-		ieee80211_configure_filter(local);
>+		/* tell driver latter (if not suspended) */
> 
> 		netif_carrier_on(dev);
> 		break;
>@@ -804,8 +804,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
> 				 sdata->dev->addr_len);
> 		spin_unlock_bh(&local->filter_lock);
> 		netif_addr_unlock_bh(sdata->dev);
>-
>-		ieee80211_configure_filter(local);
>+		/* configure filter latter (if not suspended) */
> 	}
> 
> 	del_timer_sync(&local->dynamic_ps_timer);
>@@ -872,32 +871,30 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
> 		 */
> 		ieee80211_free_keys(sdata);
> 
>-		if (going_down)
>+		if (going_down && !local->suspended)
> 			drv_remove_interface(local, sdata);
> 	}
> 
> 	sdata->bss = NULL;
> 
>-	mutex_lock(&local->mtx);
>-	hw_reconf_flags |= __ieee80211_recalc_idle(local);
>-	mutex_unlock(&local->mtx);
>-
>-	ieee80211_recalc_ps(local, -1);
>+	if (!local->suspended) {
>+		if (local->open_count == 0) {
>+			if (local->ops->napi_poll)
>+				napi_disable(&local->napi);
>+			ieee80211_clear_tx_pending(local);
>+			ieee80211_stop_device(local);
>+		} else {
>+			ieee80211_recalc_ps(local, -1);
> 
>-	if (local->open_count == 0) {
>-		if (local->ops->napi_poll)
>-			napi_disable(&local->napi);
>-		ieee80211_clear_tx_pending(local);
>-		ieee80211_stop_device(local);
>+			mutex_lock(&local->mtx);
>+			hw_reconf_flags |= __ieee80211_recalc_idle(local);
>+			mutex_unlock(&local->mtx);
> 
>-		/* no reconfiguring after stop! */
>-		hw_reconf_flags = 0;
>+			if (hw_reconf_flags)
>+				ieee80211_hw_config(local, hw_reconf_flags);
>+		}
> 	}
> 
>-	/* do after stop to avoid reconfiguring when we stop anyway */
>-	if (hw_reconf_flags)
>-		ieee80211_hw_config(local, hw_reconf_flags);
>-
> 	spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
> 	for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
> 		skb_queue_walk_safe(&local->pending[i], skb, tmp) {

Actions: View

Attachments on bug 892599: 709071 | 709072