diff options
author | Javier Cardona <javier@cozybit.com> | 2012-06-08 16:30:25 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-09 04:38:37 -0400 |
commit | 35b3fe1caa26e1ffc5144d3faadecdfa0a8a0f44 (patch) | |
tree | 743f2e811f0e18f6c1df393367109da31efb8c4f /net | |
parent | e3f5d16120f5118e2f86f1f88deaa69e6843b31f (diff) |
mac80211: Rename stainfo variable for the more common sta
Signed-off-by: Javier Cardona <javier@cozybit.com>
Reviewed-by: Jason Abele <jason@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/mesh.h | 2 | ||||
-rw-r--r-- | net/mac80211/mesh_hwmp.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index e3642756f8f4..c7400a23b64b 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h | |||
@@ -245,7 +245,7 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata); | |||
245 | int mesh_rmc_init(struct ieee80211_sub_if_data *sdata); | 245 | int mesh_rmc_init(struct ieee80211_sub_if_data *sdata); |
246 | void ieee80211s_init(void); | 246 | void ieee80211s_init(void); |
247 | void ieee80211s_update_metric(struct ieee80211_local *local, | 247 | void ieee80211s_update_metric(struct ieee80211_local *local, |
248 | struct sta_info *stainfo, struct sk_buff *skb); | 248 | struct sta_info *sta, struct sk_buff *skb); |
249 | void ieee80211s_stop(void); | 249 | void ieee80211s_stop(void); |
250 | void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata); | 250 | void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata); |
251 | void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata); | 251 | void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata); |
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index acbd1ad8eb33..9b6da2de660d 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c | |||
@@ -303,7 +303,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, | |||
303 | } | 303 | } |
304 | 304 | ||
305 | void ieee80211s_update_metric(struct ieee80211_local *local, | 305 | void ieee80211s_update_metric(struct ieee80211_local *local, |
306 | struct sta_info *stainfo, struct sk_buff *skb) | 306 | struct sta_info *sta, struct sk_buff *skb) |
307 | { | 307 | { |
308 | struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb); | 308 | struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb); |
309 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 309 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |
@@ -315,9 +315,9 @@ void ieee80211s_update_metric(struct ieee80211_local *local, | |||
315 | failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK); | 315 | failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK); |
316 | 316 | ||
317 | /* moving average, scaled to 100 */ | 317 | /* moving average, scaled to 100 */ |
318 | stainfo->fail_avg = ((80 * stainfo->fail_avg + 5) / 100 + 20 * failed); | 318 | sta->fail_avg = ((80 * sta->fail_avg + 5) / 100 + 20 * failed); |
319 | if (stainfo->fail_avg > 95) | 319 | if (sta->fail_avg > 95) |
320 | mesh_plink_broken(stainfo); | 320 | mesh_plink_broken(sta); |
321 | } | 321 | } |
322 | 322 | ||
323 | static u32 airtime_link_metric_get(struct ieee80211_local *local, | 323 | static u32 airtime_link_metric_get(struct ieee80211_local *local, |