cfg80211: fix giwrange
authorJohannes Berg <johannes@sipsolutions.net>
Mon, 6 Jul 2009 17:40:51 +0000 (19:40 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jul 2009 19:01:54 +0000 (15:01 -0400)
"cfg80211: Advertise ciphers via WE according to driver capability"
unfortunately broke iwrange -- it used the variable c
that needs to be 0 for the channel list.

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

index 226cf86..d39688c 100644 (file)
@@ -154,7 +154,7 @@ int cfg80211_wext_giwrange(struct net_device *dev,
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct iw_range *range = (struct iw_range *) extra;
        enum ieee80211_band band;
-       int c = 0;
+       int i, c = 0;
 
        if (!wdev)
                return -EOPNOTSUPP;
@@ -201,8 +201,8 @@ int cfg80211_wext_giwrange(struct net_device *dev,
        range->avg_qual.noise = range->max_qual.noise / 2;
        range->avg_qual.updated = range->max_qual.updated;
 
-       for (c = 0; c < wdev->wiphy->n_cipher_suites; c++) {
-               switch (wdev->wiphy->cipher_suites[c]) {
+       for (i = 0; i < wdev->wiphy->n_cipher_suites; i++) {
+               switch (wdev->wiphy->cipher_suites[i]) {
                case WLAN_CIPHER_SUITE_TKIP:
                        range->enc_capa |= (IW_ENC_CAPA_CIPHER_TKIP |
                                            IW_ENC_CAPA_WPA);
@@ -226,7 +226,6 @@ int cfg80211_wext_giwrange(struct net_device *dev,
        }
 
        for (band = 0; band < IEEE80211_NUM_BANDS; band ++) {
-               int i;
                struct ieee80211_supported_band *sband;
 
                sband = wdev->wiphy->bands[band];