From df82b605ae5cf4f64cac0769e665bb5e6f6d026b Mon Sep 17 00:00:00 2001 From: Patrick Kelle Date: Thu, 10 Nov 2011 15:13:11 +0100 Subject: [PATCH] --- yaml --- r: 277843 b: refs/heads/master c: 868a5f719d730866564d9bd73a8f4a8d89bdc71a h: refs/heads/master i: 277841: d9cf8b4ed5f84d451bfd0206a06799b6369bb0cb 277839: f768f9286d0c03569a5ac7122730f33c3388f9c1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/rc80211_minstrel.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 42b7087ee531..2c6d4b1311ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8915f980c1b051b4ddc7d15e027a5896611e4029 +refs/heads/master: 868a5f719d730866564d9bd73a8f4a8d89bdc71a diff --git a/trunk/net/mac80211/rc80211_minstrel.c b/trunk/net/mac80211/rc80211_minstrel.c index 58a89554b788..b39dda523f39 100644 --- a/trunk/net/mac80211/rc80211_minstrel.c +++ b/trunk/net/mac80211/rc80211_minstrel.c @@ -334,8 +334,8 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta, static void -calc_rate_durations(struct minstrel_sta_info *mi, struct ieee80211_local *local, - struct minstrel_rate *d, struct ieee80211_rate *rate) +calc_rate_durations(struct ieee80211_local *local, struct minstrel_rate *d, + struct ieee80211_rate *rate) { int erp = !!(rate->flags & IEEE80211_RATE_ERP_G); @@ -402,8 +402,7 @@ minstrel_rate_init(void *priv, struct ieee80211_supported_band *sband, mr->rix = i; mr->bitrate = sband->bitrates[i].bitrate / 5; - calc_rate_durations(mi, local, mr, - &sband->bitrates[i]); + calc_rate_durations(local, mr, &sband->bitrates[i]); /* calculate maximum number of retransmissions before * fallback (based on maximum segment size) */