Commit c4205510 authored by Yuan-Chi Pang's avatar Yuan-Chi Pang Committed by Johannes Berg
Browse files

mac80211: fix TX status reporting for ieee80211s 



TX status reporting to ieee80211s is through ieee80211s_update_metric.
There are two problems about ieee80211s_update_metric:

1. The purpose is to estimate the fail probability
to a specific link. No need to restrict to data frame.

2. Current implementation does not work if wireless driver does not
pass tx_status with skb.

Fix this by removing ieee80211_is_data condition, passing
ieee80211_tx_status directly to ieee80211s_update_metric, and
putting it in both __ieee80211_tx_status and ieee80211_tx_status_ext.

Signed-off-by: default avatarYuan-Chi Pang <fu3mo6goo@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent cb59bc14

net/mac80211/mesh.h

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata); 
int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);

void ieee80211s_init(void);

void ieee80211s_update_metric(struct ieee80211_local *local,

			      struct sta_info *sta, struct sk_buff *skb);

			      struct sta_info *sta,

			      struct ieee80211_tx_status *st);

void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);

void ieee80211_mesh_teardown_sdata(struct ieee80211_sub_if_data *sdata);

int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);

net/mac80211/mesh_hwmp.c

+3 −6
Original line number Diff line number Diff line
@@ -295,15 +295,12 @@ int mesh_path_error_tx(struct ieee80211_sub_if_data *sdata, 
}



void ieee80211s_update_metric(struct ieee80211_local *local,

		struct sta_info *sta, struct sk_buff *skb)

			      struct sta_info *sta,

			      struct ieee80211_tx_status *st)

{

	struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_tx_info *txinfo = st->info;

	int failed;



	if (!ieee80211_is_data(hdr->frame_control))

		return;



	failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);



	/* moving average, scaled to 100.

net/mac80211/status.c

+3 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, 


		rate_control_tx_status(local, sband, status);

		if (ieee80211_vif_is_mesh(&sta->sdata->vif))

			ieee80211s_update_metric(local, sta, skb);

			ieee80211s_update_metric(local, sta, status);



		if (!(info->flags & IEEE80211_TX_CTL_INJECTED) && acked)

			ieee80211_frame_acked(sta, skb);
@@ -969,6 +969,8 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, 
		}



		rate_control_tx_status(local, sband, status);

		if (ieee80211_vif_is_mesh(&sta->sdata->vif))

			ieee80211s_update_metric(local, sta, status);

	}



	if (acked || noack_success) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE