summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-06 19:40:51 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:54 -0400
commit9834c079d130217c8c5ac8791428ebeb8c660538 (patch)
tree1d880d04a1b85fe77236438ca94577a008dca82e
parent3dc27d25f288c923735e8f10fa8e578be896e96a (diff)
downloadlinux-stable-9834c079d130217c8c5ac8791428ebeb8c660538.tar.gz
linux-stable-9834c079d130217c8c5ac8791428ebeb8c660538.tar.bz2
linux-stable-9834c079d130217c8c5ac8791428ebeb8c660538.zip
cfg80211: fix giwrange
"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>
-rw-r--r--net/wireless/wext-compat.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 226cf8609079..d39688ca7fe5 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -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];