diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
| commit | 788c0a53164c05c5ccdb1472474372b72ba74644 (patch) | |
| tree | 5f274102e3dc4bcca6cb3a695aa2c8228ad5fc4f /drivers/net/wireless/rndis_wlan.c | |
| parent | e64bda89b8fe81cce9b4a20885d2c204c2d52532 (diff) | |
| parent | 78cf07472f0ede8394bacc4bc02354505080cfe1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/ps3_gelic_wireless.c
drivers/net/wireless/libertas/main.c
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index d0b1fb15c709..ed310f84f28b 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -1108,7 +1108,7 @@ static int rndis_iw_get_range(struct net_device *dev, | |||
| 1108 | /* fill in 802.11g rates */ | 1108 | /* fill in 802.11g rates */ |
| 1109 | if (has_80211g_rates) { | 1109 | if (has_80211g_rates) { |
| 1110 | num = range->num_bitrates; | 1110 | num = range->num_bitrates; |
| 1111 | for (i = 0; i < sizeof(rates_80211g); i++) { | 1111 | for (i = 0; i < ARRAY_SIZE(rates_80211g); i++) { |
| 1112 | for (j = 0; j < num; j++) { | 1112 | for (j = 0; j < num; j++) { |
| 1113 | if (range->bitrate[j] == | 1113 | if (range->bitrate[j] == |
| 1114 | rates_80211g[i] * 1000000) | 1114 | rates_80211g[i] * 1000000) |