Skip to content

L
linux
Commit 20e3c653 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rtxxx0: remove support for older wireless extensions 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0b2e3aef
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 61 deletions
drivers/staging/rt2860/sta/assoc.c
View file @ 20e3c653
...@@ -455,9 +455,7 @@ VOID MlmeAssocReqAction( ...@@ -455,9 +455,7 @@ VOID MlmeAssocReqAction(
} }
#ifdef RT30xx #ifdef RT30xx
#ifdef SIOCSIWGENIE
if (pAd->StaCfg.WpaSupplicantUP != 1) if (pAd->StaCfg.WpaSupplicantUP != 1)
#endif // SIOCSIWGENIE //
#endif #endif
RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0); RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0);
...@@ -486,7 +484,6 @@ VOID MlmeAssocReqAction( ...@@ -486,7 +484,6 @@ VOID MlmeAssocReqAction(
} }
#ifdef RT30xx #ifdef RT30xx
#ifdef SIOCSIWGENIE
if (pAd->StaCfg.WpaSupplicantUP == 1) if (pAd->StaCfg.WpaSupplicantUP == 1)
{ {
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
...@@ -494,7 +491,6 @@ VOID MlmeAssocReqAction( ...@@ -494,7 +491,6 @@ VOID MlmeAssocReqAction(
END_OF_ARGS); END_OF_ARGS);
} }
else else
#endif
#endif #endif
{ {
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
...@@ -507,9 +503,7 @@ VOID MlmeAssocReqAction( ...@@ -507,9 +503,7 @@ VOID MlmeAssocReqAction(
FrameLen += tmp; FrameLen += tmp;
#ifdef RT30xx #ifdef RT30xx
#ifdef SIOCSIWGENIE
if (pAd->StaCfg.WpaSupplicantUP != 1) if (pAd->StaCfg.WpaSupplicantUP != 1)
#endif
#endif #endif
{ {
// Append Variable IE // Append Variable IE
......
drivers/staging/rt2860/sta_ioctl.c
View file @ 20e3c653
...@@ -987,7 +987,6 @@ int rt_ioctl_iwaplist(struct net_device *dev, ...@@ -987,7 +987,6 @@ int rt_ioctl_iwaplist(struct net_device *dev,
return 0; return 0;
} }
#ifdef SIOCGIWSCAN
int rt_ioctl_siwscan(struct net_device *dev, int rt_ioctl_siwscan(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_point *data, char *extra) struct iw_point *data, char *extra)
...@@ -1084,9 +1083,6 @@ int rt_ioctl_giwscan(struct net_device *dev, ...@@ -1084,9 +1083,6 @@ int rt_ioctl_giwscan(struct net_device *dev,
char *current_ev = extra, *previous_ev = extra; char *current_ev = extra, *previous_ev = extra;
char *end_buf; char *end_buf;
char *current_val, custom[MAX_CUSTOM_LEN] = {0}; char *current_val, custom[MAX_CUSTOM_LEN] = {0};
#ifndef IWEVGENIE
char idx;
#endif // IWEVGENIE //
struct iw_event iwe; struct iw_event iwe;
if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS)) if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS))
...@@ -1313,7 +1309,6 @@ int rt_ioctl_giwscan(struct net_device *dev, ...@@ -1313,7 +1309,6 @@ int rt_ioctl_giwscan(struct net_device *dev,
return -E2BIG; return -E2BIG;
} }
#ifdef IWEVGENIE
//WPA IE //WPA IE
if (pAdapter->ScanTab.BssEntry[i].WpaIE.IELen > 0) if (pAdapter->ScanTab.BssEntry[i].WpaIE.IELen > 0)
{ {
...@@ -1341,40 +1336,6 @@ int rt_ioctl_giwscan(struct net_device *dev, ...@@ -1341,40 +1336,6 @@ int rt_ioctl_giwscan(struct net_device *dev,
if (current_ev == previous_ev) if (current_ev == previous_ev)
return -E2BIG; return -E2BIG;
} }
#else
//WPA IE
//================================
if (pAdapter->ScanTab.BssEntry[i].WpaIE.IELen > 0)
{
NdisZeroMemory(&iwe, sizeof(iwe));
memset(&custom[0], 0, MAX_CUSTOM_LEN);
iwe.cmd = IWEVCUSTOM;
iwe.u.data.length = (pAdapter->ScanTab.BssEntry[i].WpaIE.IELen * 2) + 7;
NdisMoveMemory(custom, "wpa_ie=", 7);
for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].WpaIE.IELen; idx++)
sprintf(custom + strlen(custom), "%02x", pAdapter->ScanTab.BssEntry[i].WpaIE.IE[idx]);
previous_ev = current_ev;
current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
if (current_ev == previous_ev)
return -E2BIG;
}
//WPA2 IE
if (pAdapter->ScanTab.BssEntry[i].RsnIE.IELen > 0)
{
NdisZeroMemory(&iwe, sizeof(iwe));
memset(&custom[0], 0, MAX_CUSTOM_LEN);
iwe.cmd = IWEVCUSTOM;
iwe.u.data.length = (pAdapter->ScanTab.BssEntry[i].RsnIE.IELen * 2) + 7;
NdisMoveMemory(custom, "rsn_ie=", 7);
for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].RsnIE.IELen; idx++)
sprintf(custom + strlen(custom), "%02x", pAdapter->ScanTab.BssEntry[i].RsnIE.IE[idx]);
previous_ev = current_ev;
current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
if (current_ev == previous_ev)
return -E2BIG;
}
#endif // IWEVGENIE //
} }
data->length = current_ev - extra; data->length = current_ev - extra;
...@@ -1382,7 +1343,6 @@ int rt_ioctl_giwscan(struct net_device *dev, ...@@ -1382,7 +1343,6 @@ int rt_ioctl_giwscan(struct net_device *dev,
DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
return 0; return 0;
} }
#endif
int rt_ioctl_siwessid(struct net_device *dev, int rt_ioctl_siwessid(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
...@@ -2214,7 +2174,6 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info, ...@@ -2214,7 +2174,6 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
return Status; return Status;
} }
#ifdef SIOCSIWMLME
int rt_ioctl_siwmlme(struct net_device *dev, int rt_ioctl_siwmlme(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, union iwreq_data *wrqu,
...@@ -2270,7 +2229,6 @@ int rt_ioctl_siwmlme(struct net_device *dev, ...@@ -2270,7 +2229,6 @@ int rt_ioctl_siwmlme(struct net_device *dev,
return 0; return 0;
} }
#endif // SIOCSIWMLME //
int rt_ioctl_siwauth(struct net_device *dev, int rt_ioctl_siwauth(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
...@@ -2707,7 +2665,6 @@ rt_ioctl_giwencodeext(struct net_device *dev, ...@@ -2707,7 +2665,6 @@ rt_ioctl_giwencodeext(struct net_device *dev,
return 0; return 0;
} }
#ifdef SIOCSIWGENIE
int rt_ioctl_siwgenie(struct net_device *dev, int rt_ioctl_siwgenie(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
...@@ -2731,7 +2688,6 @@ int rt_ioctl_siwgenie(struct net_device *dev, ...@@ -2731,7 +2688,6 @@ int rt_ioctl_siwgenie(struct net_device *dev,
return 0; return 0;
} }
#endif // SIOCSIWGENIE //
int rt_ioctl_giwgenie(struct net_device *dev, int rt_ioctl_giwgenie(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
...@@ -2746,7 +2702,6 @@ int rt_ioctl_giwgenie(struct net_device *dev, ...@@ -2746,7 +2702,6 @@ int rt_ioctl_giwgenie(struct net_device *dev,
return 0; return 0;
} }
#ifdef SIOCSIWGENIE
if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) if (pAd->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE)
{ {
if (wrqu->data.length < pAd->StaCfg.RSNIE_Len) if (wrqu->data.length < pAd->StaCfg.RSNIE_Len)
...@@ -2756,7 +2711,6 @@ int rt_ioctl_giwgenie(struct net_device *dev, ...@@ -2756,7 +2711,6 @@ int rt_ioctl_giwgenie(struct net_device *dev,
memcpy(extra, &pAd->StaCfg.RSN_IE[0], pAd->StaCfg.RSNIE_Len); memcpy(extra, &pAd->StaCfg.RSN_IE[0], pAd->StaCfg.RSNIE_Len);
} }
else else
#endif // SIOCSIWGENIE //
{ {
UCHAR RSNIe = IE_WPA; UCHAR RSNIe = IE_WPA;
...@@ -3117,19 +3071,10 @@ static const iw_handler rt_handler[] = ...@@ -3117,19 +3071,10 @@ static const iw_handler rt_handler[] =
(iw_handler) NULL, /* SIOCGIWTHRSPY */ (iw_handler) NULL, /* SIOCGIWTHRSPY */
(iw_handler) rt_ioctl_siwap, /* SIOCSIWAP */ (iw_handler) rt_ioctl_siwap, /* SIOCSIWAP */
(iw_handler) rt_ioctl_giwap, /* SIOCGIWAP */ (iw_handler) rt_ioctl_giwap, /* SIOCGIWAP */
#ifdef SIOCSIWMLME
(iw_handler) rt_ioctl_siwmlme, /* SIOCSIWMLME */ (iw_handler) rt_ioctl_siwmlme, /* SIOCSIWMLME */
#else
(iw_handler) NULL, /* SIOCSIWMLME */
#endif // SIOCSIWMLME //
(iw_handler) rt_ioctl_iwaplist, /* SIOCGIWAPLIST */ (iw_handler) rt_ioctl_iwaplist, /* SIOCGIWAPLIST */
#ifdef SIOCGIWSCAN
(iw_handler) rt_ioctl_siwscan, /* SIOCSIWSCAN */ (iw_handler) rt_ioctl_siwscan, /* SIOCSIWSCAN */
(iw_handler) rt_ioctl_giwscan, /* SIOCGIWSCAN */ (iw_handler) rt_ioctl_giwscan, /* SIOCGIWSCAN */
#else
(iw_handler) NULL, /* SIOCSIWSCAN */
(iw_handler) NULL, /* SIOCGIWSCAN */
#endif /* SIOCGIWSCAN */
(iw_handler) rt_ioctl_siwessid, /* SIOCSIWESSID */ (iw_handler) rt_ioctl_siwessid, /* SIOCSIWESSID */
(iw_handler) rt_ioctl_giwessid, /* SIOCGIWESSID */ (iw_handler) rt_ioctl_giwessid, /* SIOCGIWESSID */
(iw_handler) rt_ioctl_siwnickn, /* SIOCSIWNICKN */ (iw_handler) rt_ioctl_siwnickn, /* SIOCSIWNICKN */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7