Attachment 698998 Details for Bug 891019 – ieee80211_disconnect_on_suspend.patch

ieee80211_disconnect_on_suspend.patch

ieee80211_disconnect_on_suspend.patch (text/plain), 3.31 KB, created by Stanislaw Gruszka on 2013-02-18 17:05:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2013-02-18 17:05:24 UTC

Size: 3.31 KB

patch

obsolete

>diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
>index 76cdcfc..853c7b1 100644
>--- a/net/mac80211/ieee80211_i.h
>+++ b/net/mac80211/ieee80211_i.h
>@@ -1261,6 +1261,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
> 			 struct cfg80211_deauth_request *req);
> int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
> 			   struct cfg80211_disassoc_request *req);
>+void ieee80211_disconnect(struct ieee80211_sub_if_data *sdata, u8 reason);
> void ieee80211_send_pspoll(struct ieee80211_local *local,
> 			   struct ieee80211_sub_if_data *sdata);
> void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency);
>diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
>index 6e9de6f..5733d11 100644
>--- a/net/mac80211/mlme.c
>+++ b/net/mac80211/mlme.c
>@@ -1790,7 +1790,7 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
> }
> EXPORT_SYMBOL(ieee80211_ap_probereq_get);
> 
>-static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
>+void ieee80211_disconnect(struct ieee80211_sub_if_data *sdata, u8 reason)
> {
> 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
> 	u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
>@@ -1801,9 +1801,8 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
> 		return;
> 	}
> 
>-	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
>-			       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
>-			       true, frame_buf);
>+	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason, true,
>+			       frame_buf);
> 	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;
> 	mutex_unlock(&ifmgd->mtx);
> 
>@@ -1833,7 +1832,8 @@ static void ieee80211_beacon_connection_loss_work(struct work_struct *work)
> 	if (ifmgd->connection_loss) {
> 		sdata_info(sdata, "Connection to AP %pM lost\n",
> 			   ifmgd->bssid);
>-		__ieee80211_disconnect(sdata);
>+		ieee80211_disconnect(sdata,
>+				     WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
> 	} else {
> 		ieee80211_mgd_probe_ap(sdata, true);
> 	}
>@@ -1847,7 +1847,7 @@ static void ieee80211_csa_connection_drop_work(struct work_struct *work)
> 
> 	ieee80211_wake_queues_by_reason(&sdata->local->hw,
> 					IEEE80211_QUEUE_STOP_REASON_CSA);
>-	__ieee80211_disconnect(sdata);
>+	ieee80211_disconnect(sdata, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
> }
> 
> void ieee80211_beacon_loss(struct ieee80211_vif *vif)
>diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
>index 53801d2..c69c0e1 100644
>--- a/net/mac80211/pm.c
>+++ b/net/mac80211/pm.c
>@@ -134,7 +134,10 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
> 			/* skip these */
> 			continue;
> 		case NL80211_IFTYPE_STATION:
>-			if (sdata->vif.bss_conf.assoc)
>+			if (!local->wowlan)
>+				ieee80211_disconnect(sdata,
>+					WLAN_REASON_DISASSOC_STA_HAS_LEFT);
>+			else if (sdata->vif.bss_conf.assoc)
> 				changed = BSS_CHANGED_ASSOC |
> 					  BSS_CHANGED_BSSID |
> 					  BSS_CHANGED_IDLE;
>@@ -144,13 +147,12 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
> 		case NL80211_IFTYPE_MESH_POINT:
> 			if (sdata->vif.bss_conf.enable_beacon)
> 				changed = BSS_CHANGED_BEACON_ENABLED;
>-			break;
>+			/* fall through */
> 		default:
>+			ieee80211_quiesce(sdata);
> 			break;
> 		}
> 
>-		ieee80211_quiesce(sdata);
>-
> 		sdata->suspend_bss_conf = sdata->vif.bss_conf;
> 		memset(&sdata->vif.bss_conf, 0, sizeof(sdata->vif.bss_conf));
> 		sdata->vif.bss_conf.idle = true;

Actions: View

Attachments on bug 891019: 670870 | 698998 | 699006