Commit 35b3fe1c authored by Javier Cardona's avatar Javier Cardona Committed by Johannes Berg
Browse files

mac80211: Rename stainfo variable for the more common sta 



Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Reviewed-by: default avatarJason Abele <jason@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e3f5d161

net/mac80211/mesh.h

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 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 *stainfo, struct sk_buff *skb);

		struct sta_info *sta, struct sk_buff *skb);

void ieee80211s_stop(void);

void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);

void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);

net/mac80211/mesh_hwmp.c

+4 −4
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, 
}



void ieee80211s_update_metric(struct ieee80211_local *local,

		struct sta_info *stainfo, struct sk_buff *skb)

		struct sta_info *sta, struct sk_buff *skb)

{

	struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -315,9 +315,9 @@ void ieee80211s_update_metric(struct ieee80211_local *local, 
	failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);



	/* moving average, scaled to 100 */

	stainfo->fail_avg = ((80 * stainfo->fail_avg + 5) / 100 + 20 * failed);

	if (stainfo->fail_avg > 95)

		mesh_plink_broken(stainfo);

	sta->fail_avg = ((80 * sta->fail_avg + 5) / 100 + 20 * failed);

	if (sta->fail_avg > 95)

		mesh_plink_broken(sta);

}



static u32 airtime_link_metric_get(struct ieee80211_local *local,