Return-path: Received: from mail-pz0-f46.google.com ([209.85.210.46]:44606 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994Ab2FFXTz (ORCPT ); Wed, 6 Jun 2012 19:19:55 -0400 Received: by dady13 with SMTP id y13so2117dad.19 for ; Wed, 06 Jun 2012 16:19:54 -0700 (PDT) From: Jason Abele To: "John W. Linville" Cc: Johannes Berg , devel@lists.open80211s.org, linux-wireless Subject: [PATCH v2 4/5] mac80211: Rename stainfo variable for the more common sta Date: Wed, 6 Jun 2012 16:19:34 -0700 Message-Id: <1339024775-15405-5-git-send-email-jason@cozybit.com> (sfid-20120607_011958_938841_87654B96) In-Reply-To: <1339024775-15405-1-git-send-email-jason@cozybit.com> References: <1339024775-15405-1-git-send-email-jason@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Javier Cardona Signed-off-by: Javier Cardona --- net/mac80211/mesh_hwmp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 8fb3e59..22b327a 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, } 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; @@ -317,16 +317,16 @@ 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); - sta_set_rate_info_tx(stainfo, &stainfo->last_tx_rate, &rinfo); + sta_set_rate_info_tx(sta, &sta->last_tx_rate, &rinfo); rate = cfg80211_calculate_bitrate(&rinfo); if (WARN_ON(!rate)) return; - ewma_add(&stainfo->avg_rate, rate); + ewma_add(&sta->avg_rate, rate); return; } -- 1.7.9.5