Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277843
b: refs/heads/master
c: 868a5f7
h: refs/heads/master
i:
  277841: d9cf8b4
  277839: f768f92
v: v3
  • Loading branch information
Patrick Kelle authored and John W. Linville committed Nov 11, 2011
1 parent 5991330 commit df82b60
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8915f980c1b051b4ddc7d15e027a5896611e4029
refs/heads/master: 868a5f719d730866564d9bd73a8f4a8d89bdc71a
7 changes: 3 additions & 4 deletions trunk/net/mac80211/rc80211_minstrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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) */
Expand Down

0 comments on commit df82b60

Please sign in to comment.