aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_wx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ieee80211/ieee80211_wx.c')
-rw-r--r--net/ieee80211/ieee80211_wx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 04f0897b0653..fc4e1377aba7 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -182,7 +182,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
182 if (iwe.u.data.length) 182 if (iwe.u.data.length)
183 start = iwe_stream_add_point(start, stop, &iwe, custom); 183 start = iwe_stream_add_point(start, stop, &iwe, custom);
184 184
185 if (ieee->wpa_enabled && network->wpa_ie_len) { 185 if (network->wpa_ie_len) {
186 char buf[MAX_WPA_IE_LEN * 2 + 30]; 186 char buf[MAX_WPA_IE_LEN * 2 + 30];
187 187
188 u8 *p = buf; 188 u8 *p = buf;
@@ -197,7 +197,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
197 start = iwe_stream_add_point(start, stop, &iwe, buf); 197 start = iwe_stream_add_point(start, stop, &iwe, buf);
198 } 198 }
199 199
200 if (ieee->wpa_enabled && network->rsn_ie_len) { 200 if (network->rsn_ie_len) {
201 char buf[MAX_WPA_IE_LEN * 2 + 30]; 201 char buf[MAX_WPA_IE_LEN * 2 + 30];
202 202
203 u8 *p = buf; 203 u8 *p = buf;
@@ -351,7 +351,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
351 } 351 }
352 352
353 if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) 353 if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
354 new_crypt->priv = new_crypt->ops->init(key); 354 new_crypt->priv = new_crypt->ops->init(ieee, key);
355 355
356 if (!new_crypt->ops || !new_crypt->priv) { 356 if (!new_crypt->ops || !new_crypt->priv) {
357 kfree(new_crypt); 357 kfree(new_crypt);