Commit 446075d7 authored by Marco Porsch's avatar Marco Porsch Committed by Johannes Berg
Browse files

mac80211: fixes for mesh powersave logic 



This patch fixes errors in the mesh powersave logic which
cause that remote peers do not get peer power mode change
notifications and mesh peer service periods (MPSPs) got
stuck.

When closing a peer link, set the (now invalid) peer-specific
power mode to 'unknown'.

Avoid overhead when local power mode is unchanged.

Reliably clear MPSP flags on peering status update.

Avoid MPSP flags getting stuck by not requesting a further
MPSP ownership if we already are an MPSP owner.

Signed-off-by: default avatarMarco Porsch <marco@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 17ac4959

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -1343,8 +1343,8 @@ static int sta_apply_parameters(struct ieee80211_local *local, 
				sta->plink_state = params->plink_state;



				ieee80211_mps_sta_status_update(sta);

				changed |=

				      ieee80211_mps_local_status_update(sdata);

				changed |= ieee80211_mps_set_sta_local_pm(sta,

						NL80211_MESH_POWER_UNKNOWN);

				break;

			default:

				/*  nothing  */

net/mac80211/mesh_plink.c

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ static u32 __mesh_plink_deactivate(struct sta_info *sta) 
	mesh_path_flush_by_nexthop(sta);



	ieee80211_mps_sta_status_update(sta);

	changed |= ieee80211_mps_local_status_update(sdata);

	changed |= ieee80211_mps_set_sta_local_pm(sta,

			NL80211_MESH_POWER_UNKNOWN);



	return changed;

}

net/mac80211/mesh_ps.c

+18 −15
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ u32 ieee80211_mps_set_sta_local_pm(struct sta_info *sta, 
{

	struct ieee80211_sub_if_data *sdata = sta->sdata;



	if (sta->local_pm == pm)

		return 0;



	mps_dbg(sdata, "local STA operates in mode %d with %pM\n",

		pm, sta->sta.addr);
@@ -245,6 +248,14 @@ void ieee80211_mps_sta_status_update(struct sta_info *sta) 


	do_buffer = (pm != NL80211_MESH_POWER_ACTIVE);



	/* clear the MPSP flags for non-peers or active STA */

	if (sta->plink_state != NL80211_PLINK_ESTAB) {

		clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);

		clear_sta_flag(sta, WLAN_STA_MPSP_RECIPIENT);

	} else if (!do_buffer) {

		clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);

	}



	/* Don't let the same PS state be set twice */

	if (test_sta_flag(sta, WLAN_STA_PS_STA) == do_buffer)

		return;
@@ -257,14 +268,6 @@ void ieee80211_mps_sta_status_update(struct sta_info *sta) 
	} else {

		ieee80211_sta_ps_deliver_wakeup(sta);

	}



	/* clear the MPSP flags for non-peers or active STA */

	if (sta->plink_state != NL80211_PLINK_ESTAB) {

		clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);

		clear_sta_flag(sta, WLAN_STA_MPSP_RECIPIENT);

	} else if (!do_buffer) {

		clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);

	}

}



static void mps_set_sta_peer_pm(struct sta_info *sta,
@@ -444,8 +447,7 @@ static void mpsp_qos_null_append(struct sta_info *sta, 
 */

static void mps_frame_deliver(struct sta_info *sta, int n_frames)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = sta->sdata->local;

	int ac;

	struct sk_buff_head frames;

	struct sk_buff *skb;
@@ -558,10 +560,10 @@ void ieee80211_mpsp_trigger_process(u8 *qc, struct sta_info *sta, 
}



/**

 * ieee80211_mps_frame_release - release buffered frames in response to beacon

 * ieee80211_mps_frame_release - release frames buffered due to mesh power save

 *

 * @sta: mesh STA

 * @elems: beacon IEs

 * @elems: IEs of beacon or probe response

 *

 * For peers if we have individually-addressed frames buffered or the peer

 * indicates buffered frames, send a corresponding MPSP trigger frame. Since
@@ -588,6 +590,7 @@ void ieee80211_mps_frame_release(struct sta_info *sta, 
	    (!elems->awake_window || !le16_to_cpu(*elems->awake_window)))

		return;



	if (!test_sta_flag(sta, WLAN_STA_MPSP_OWNER))

		for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)

			buffer_local += skb_queue_len(&sta->ps_tx_buf[ac]) +

					skb_queue_len(&sta->tx_filtered[ac]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE