diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-01 17:57:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-01 17:57:40 -0500 |
| commit | b4017c5368f992fb8fb3a2545a0977082c6664e4 (patch) | |
| tree | b18fee77164297141c988965a9846225f8d8b3d3 /net/mac80211/rate.c | |
| parent | 97767a87f3be8834192dc3fc9412aaccf708d87f (diff) | |
| parent | 413708bbaf5c85c4c8a264145f7d6c3afcd97f99 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/tg3.c
Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rate.c')
| -rw-r--r-- | net/mac80211/rate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 111fba38be8..b4f7600a3e3 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -447,7 +447,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) { info->control.rates[i].idx = -1; info->control.rates[i].flags = 0; - info->control.rates[i].count = 1; + info->control.rates[i].count = 0; } if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) |