diff options
Diffstat (limited to 'drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c')
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c index bdf67ec5df21..698507e00f31 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c @@ -194,7 +194,7 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee, iwe.u.data.length = p - custom; if (iwe.u.data.length) start = iwe_stream_add_point(info, start, stop, &iwe, custom); -#if (WIRELESS_EXT < 18) + if (ieee->wpa_enabled && network->wpa_ie_len){ char buf[MAX_WPA_IE_LEN * 2 + 30]; // printk("WPA IE\n"); @@ -224,26 +224,6 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee, iwe.u.data.length = strlen(buf); start = iwe_stream_add_point(info, start, stop, &iwe, buf); } -#else - memset(&iwe, 0, sizeof(iwe)); - if (network->wpa_ie_len) - { - char buf[MAX_WPA_IE_LEN]; - memcpy(buf, network->wpa_ie, network->wpa_ie_len); - iwe.cmd = IWEVGENIE; - iwe.u.data.length = network->wpa_ie_len; - start = iwe_stream_add_point(info, start, stop, &iwe, buf); - } - memset(&iwe, 0, sizeof(iwe)); - if (network->rsn_ie_len) - { - char buf[MAX_WPA_IE_LEN]; - memcpy(buf, network->rsn_ie, network->rsn_ie_len); - iwe.cmd = IWEVGENIE; - iwe.u.data.length = network->rsn_ie_len; - start = iwe_stream_add_point(info, start, stop, &iwe, buf); - } -#endif /* Add EXTRA: Age to display seconds since last beacon/probe response @@ -305,6 +285,7 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee, return err; } +EXPORT_SYMBOL(ieee80211_wx_get_scan); int ieee80211_wx_set_encode(struct ieee80211_device *ieee, struct iw_request_info *info, @@ -479,6 +460,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, } return 0; } +EXPORT_SYMBOL(ieee80211_wx_set_encode); int ieee80211_wx_get_encode(struct ieee80211_device *ieee, struct iw_request_info *info, @@ -521,7 +503,8 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee, return 0; } -#if (WIRELESS_EXT >= 18) +EXPORT_SYMBOL(ieee80211_wx_get_encode); + int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -695,6 +678,7 @@ done: } return ret; } +EXPORT_SYMBOL(ieee80211_wx_set_encode_ext); int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee, struct iw_request_info *info, @@ -750,6 +734,7 @@ int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee, return 0; } +EXPORT_SYMBOL(ieee80211_wx_get_encode_ext); int ieee80211_wx_set_mlme(struct ieee80211_device *ieee, struct iw_request_info *info, @@ -766,6 +751,7 @@ int ieee80211_wx_set_mlme(struct ieee80211_device *ieee, } return 0; } +EXPORT_SYMBOL(ieee80211_wx_set_mlme); int ieee80211_wx_set_auth(struct ieee80211_device *ieee, struct iw_request_info *info, @@ -792,7 +778,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee, break; case IW_AUTH_80211_AUTH_ALG: - //printk("======>%s():data->value is %d\n",__FUNCTION__,data->value); + //printk("======>%s():data->value is %d\n",__func__,data->value); // ieee->open_wep = (data->value&IW_AUTH_ALG_OPEN_SYSTEM)?1:0; if(data->value & IW_AUTH_ALG_SHARED_KEY){ ieee->open_wep = 0; @@ -828,7 +814,8 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee, } return 0; } -#endif +EXPORT_SYMBOL(ieee80211_wx_set_auth); + int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) { u8 *buf; @@ -862,14 +849,4 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) return 0; } - EXPORT_SYMBOL(ieee80211_wx_set_gen_ie); -#if (WIRELESS_EXT >= 18) -EXPORT_SYMBOL(ieee80211_wx_set_mlme); -EXPORT_SYMBOL(ieee80211_wx_set_auth); -EXPORT_SYMBOL(ieee80211_wx_set_encode_ext); -EXPORT_SYMBOL(ieee80211_wx_get_encode_ext); -#endif -EXPORT_SYMBOL(ieee80211_wx_get_scan); -EXPORT_SYMBOL(ieee80211_wx_set_encode); -EXPORT_SYMBOL(ieee80211_wx_get_encode); |