mac80211_hwsim: don't register CCK rates on 5ghz
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 27 Oct 2009 19:53:58 +0000 (20:53 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Oct 2009 20:49:19 +0000 (16:49 -0400)
This buglet confused me a lot just now ...

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mac80211_hwsim.c

index 38cfd79..d2b2e5e 100644 (file)
@@ -1045,19 +1045,20 @@ static int __init init_mac80211_hwsim(void)
                                sband->channels = data->channels_2ghz;
                                sband->n_channels =
                                        ARRAY_SIZE(hwsim_channels_2ghz);
+                               sband->bitrates = data->rates;
+                               sband->n_bitrates = ARRAY_SIZE(hwsim_rates);
                                break;
                        case IEEE80211_BAND_5GHZ:
                                sband->channels = data->channels_5ghz;
                                sband->n_channels =
                                        ARRAY_SIZE(hwsim_channels_5ghz);
+                               sband->bitrates = data->rates + 4;
+                               sband->n_bitrates = ARRAY_SIZE(hwsim_rates) - 4;
                                break;
                        default:
                                break;
                        }
 
-                       sband->bitrates = data->rates;
-                       sband->n_bitrates = ARRAY_SIZE(hwsim_rates);
-
                        sband->ht_cap.ht_supported = true;
                        sband->ht_cap.cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
                                IEEE80211_HT_CAP_GRN_FLD |