Attachment 699006 Details for Bug 891019 – ieee80211_disconnect_on_suspend_v3.7.patch

ieee80211_disconnect_on_suspend_v3.7.patch

ieee80211_disconnect_on_suspend_v3.7.patch (text/plain), 2.93 KB, created by Stanislaw Gruszka on 2013-02-18 17:09:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2013-02-18 17:09:17 UTC

Size: 2.93 KB

patch

obsolete

>diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
>index 493e2e8..e08e9f9 100644
>--- a/net/mac80211/ieee80211_i.h
>+++ b/net/mac80211/ieee80211_i.h
>@@ -1210,6 +1210,8 @@ 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,
>+			  bool transmit_frame, 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 1b7eed2..8ec1606 100644
>--- a/net/mac80211/mlme.c
>+++ b/net/mac80211/mlme.c
>@@ -1701,8 +1701,8 @@ 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,
>-				   bool transmit_frame)
>+void ieee80211_disconnect(struct ieee80211_sub_if_data *sdata,
>+			  bool transmit_frame, u8 reason)
> {
> 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
> 	struct ieee80211_local *local = sdata->local;
>@@ -1714,8 +1714,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata,
> 		return;
> 	}
> 
>-	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
>-			       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
>+	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
> 			       transmit_frame, frame_buf);
> 	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;
> 	mutex_unlock(&ifmgd->mtx);
>@@ -1750,7 +1749,8 @@ static void ieee80211_beacon_connection_loss_work(struct work_struct *work)
> 	if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR) {
> 		sdata_info(sdata, "Connection to AP %pM lost\n",
> 			   ifmgd->bssid);
>-		__ieee80211_disconnect(sdata, false);
>+		ieee80211_disconnect(sdata, false,
>+				     WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
> 	} else {
> 		ieee80211_mgd_probe_ap(sdata, true);
> 	}
>@@ -1764,7 +1764,8 @@ 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, true);
>+	ieee80211_disconnect(sdata, true,
>+			     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 5c572e7..f021054 100644
>--- a/net/mac80211/pm.c
>+++ b/net/mac80211/pm.c
>@@ -131,6 +131,10 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
> 		if (!ieee80211_sdata_running(sdata))
> 			continue;
> 
>+		if (sdata->vif.type == NL80211_IFTYPE_STATION && !local->wowlan)
>+			ieee80211_disconnect(sdata, true,
>+					     WLAN_REASON_DISASSOC_STA_HAS_LEFT);
>+
> 		/* disable beaconing */
> 		ieee80211_bss_info_change_notify(sdata,
> 			BSS_CHANGED_BEACON_ENABLED);

Actions: View

Attachments on bug 891019: 670870 | 698998 | 699006