Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8360ab8 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME 



Since commit 12e7f517,
IEEE80211_SDATA_DISCONNECT_RESUME no longer worked as
it would simply never be tested. Restore a bit of the
code removed there and in 9b7d72c1
to make it work again.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a92eecbb

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,7 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata); 
void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata);

void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata,

				  __le16 fc, bool acked);

void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata);



/* IBSS code */

void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);

net/mac80211/mlme.c

+25 −0
Original line number Diff line number Diff line
@@ -3623,6 +3623,31 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) 
	}

}



#ifdef CONFIG_PM

void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;



	mutex_lock(&ifmgd->mtx);

	if (!ifmgd->associated) {

		mutex_unlock(&ifmgd->mtx);

		return;

	}



	if (sdata->flags & IEEE80211_SDATA_DISCONNECT_RESUME) {

		sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_RESUME;

		mlme_dbg(sdata, "driver requested disconnect after resume\n");

		ieee80211_sta_connection_lost(sdata,

					      ifmgd->associated->bssid,

					      WLAN_REASON_UNSPECIFIED,

					      true);

		mutex_unlock(&ifmgd->mtx);

		return;

	}

	mutex_unlock(&ifmgd->mtx);

}

#endif



/* interface setup */

void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)

{

net/mac80211/util.c

+7 −0
Original line number Diff line number Diff line
@@ -1740,6 +1740,13 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
	mb();

	local->resuming = false;



	list_for_each_entry(sdata, &local->interfaces, list) {

		if (!ieee80211_sdata_running(sdata))

			continue;

		if (sdata->vif.type == NL80211_IFTYPE_STATION)

			ieee80211_sta_restart(sdata);

	}



	mod_timer(&local->sta_cleanup, jiffies + 1);

#else

	WARN_ON(1);