diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-06 13:40:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:01:54 -0400 |
commit | 9834c079d130217c8c5ac8791428ebeb8c660538 (patch) | |
tree | 1d880d04a1b85fe77236438ca94577a008dca82e /net/wireless/wext-compat.c | |
parent | 3dc27d25f288c923735e8f10fa8e578be896e96a (diff) |
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>
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r-- | net/wireless/wext-compat.c | 7 |
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, | |||
154 | struct wireless_dev *wdev = dev->ieee80211_ptr; | 154 | struct wireless_dev *wdev = dev->ieee80211_ptr; |
155 | struct iw_range *range = (struct iw_range *) extra; | 155 | struct iw_range *range = (struct iw_range *) extra; |
156 | enum ieee80211_band band; | 156 | enum ieee80211_band band; |
157 | int c = 0; | 157 | int i, c = 0; |
158 | 158 | ||
159 | if (!wdev) | 159 | if (!wdev) |
160 | return -EOPNOTSUPP; | 160 | return -EOPNOTSUPP; |
@@ -201,8 +201,8 @@ int cfg80211_wext_giwrange(struct net_device *dev, | |||
201 | range->avg_qual.noise = range->max_qual.noise / 2; | 201 | range->avg_qual.noise = range->max_qual.noise / 2; |
202 | range->avg_qual.updated = range->max_qual.updated; | 202 | range->avg_qual.updated = range->max_qual.updated; |
203 | 203 | ||
204 | for (c = 0; c < wdev->wiphy->n_cipher_suites; c++) { | 204 | for (i = 0; i < wdev->wiphy->n_cipher_suites; i++) { |
205 | switch (wdev->wiphy->cipher_suites[c]) { | 205 | switch (wdev->wiphy->cipher_suites[i]) { |
206 | case WLAN_CIPHER_SUITE_TKIP: | 206 | case WLAN_CIPHER_SUITE_TKIP: |
207 | range->enc_capa |= (IW_ENC_CAPA_CIPHER_TKIP | | 207 | range->enc_capa |= (IW_ENC_CAPA_CIPHER_TKIP | |
208 | IW_ENC_CAPA_WPA); | 208 | IW_ENC_CAPA_WPA); |
@@ -226,7 +226,6 @@ int cfg80211_wext_giwrange(struct net_device *dev, | |||
226 | } | 226 | } |
227 | 227 | ||
228 | for (band = 0; band < IEEE80211_NUM_BANDS; band ++) { | 228 | for (band = 0; band < IEEE80211_NUM_BANDS; band ++) { |
229 | int i; | ||
230 | struct ieee80211_supported_band *sband; | 229 | struct ieee80211_supported_band *sband; |
231 | 230 | ||
232 | sband = wdev->wiphy->bands[band]; | 231 | sband = wdev->wiphy->bands[band]; |