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

Commit 3b17fbf8 authored by Maxim Altshul's avatar Maxim Altshul Committed by Johannes Berg
Browse files

mac80211: mesh: Add support for HW RC implementation 



Mesh HWMP module will be able to rely on the HW
RC algorithm if it exists, for path metric calculations.

This allows the metric calculation mechanism to calculate
a correct metric, based on PER and last TX rate both via
HW RC algorithm if it exists or via parameters collected
by the SW.

Signed-off-by: default avatarMaxim Altshul <maxim.altshul@ti.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6cdaf03f

net/mac80211/mesh_hwmp.c

+19 −8
Original line number Diff line number Diff line
@@ -326,6 +326,16 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local, 
	u32 tx_time, estimated_retx;

	u64 result;



	/* Try to get rate based on HW/SW RC algorithm.

	 * Rate is returned in units of Kbps, correct this

	 * to comply with airtime calculation units

	 * Round up in case we get rate < 100Kbps

	 */

	rate = DIV_ROUND_UP(sta_get_expected_throughput(sta), 100);



	if (rate) {

		err = 0;

	} else {

		if (sta->mesh->fail_avg >= 100)

			return MAX_METRIC;
@@ -335,6 +345,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local, 
			return MAX_METRIC;



		err = (sta->mesh->fail_avg << ARITH_SHIFT) / 100;

	}



	/* bitrate is in units of 100 Kbps, while we need rate in units of

	 * 1Mbps. This will be corrected on tx_time computation.

net/mac80211/sta_info.c

+19 −4
Original line number Diff line number Diff line
@@ -2279,16 +2279,31 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))

		sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);



	thr = sta_get_expected_throughput(sta);



	if (thr != 0) {

		sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT);

		sinfo->expected_throughput = thr;

	}

}



u32 sta_get_expected_throughput(struct sta_info *sta)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_local *local = sdata->local;

	struct rate_control_ref *ref = NULL;

	u32 thr = 0;



	if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))

		ref = local->rate_ctrl;



	/* check if the driver has a SW RC implementation */

	if (ref && ref->ops->get_expected_throughput)

		thr = ref->ops->get_expected_throughput(sta->rate_ctrl_priv);

	else

		thr = drv_get_expected_throughput(local, &sta->sta);



	if (thr != 0) {

		sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT);

		sinfo->expected_throughput = thr;

	}

	return thr;

}



unsigned long ieee80211_sta_last_active(struct sta_info *sta)

net/mac80211/sta_info.h

+2 −0
Original line number Diff line number Diff line
@@ -712,6 +712,8 @@ void sta_set_rate_info_tx(struct sta_info *sta, 
			  struct rate_info *rinfo);

void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo);



u32 sta_get_expected_throughput(struct sta_info *sta);



void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,

			  unsigned long exp_time);

u8 sta_info_tx_streams(struct sta_info *sta);