diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /net/mac80211/rc80211_minstrel.c | |
| parent | 928f308f556f4943e50c5064b546f47bce301f02 (diff) | |
| parent | 9b05126baa146fc3f41360164141d4e1b3ea93c4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/net/tcp.h
Diffstat (limited to 'net/mac80211/rc80211_minstrel.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index 3824990d340b..70df3dcc3cf6 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c | |||
| @@ -476,7 +476,7 @@ minstrel_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp) | |||
| 476 | return NULL; | 476 | return NULL; |
| 477 | 477 | ||
| 478 | for (i = 0; i < IEEE80211_NUM_BANDS; i++) { | 478 | for (i = 0; i < IEEE80211_NUM_BANDS; i++) { |
| 479 | sband = hw->wiphy->bands[hw->conf.channel->band]; | 479 | sband = hw->wiphy->bands[i]; |
| 480 | if (sband->n_bitrates > max_rates) | 480 | if (sband->n_bitrates > max_rates) |
| 481 | max_rates = sband->n_bitrates; | 481 | max_rates = sband->n_bitrates; |
| 482 | } | 482 | } |