summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860/sta/assoc.c
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-08-06 16:09:34 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:06 -0700
commite82bf85ec92e9cb2db9b226c1a29e2219b489b94 (patch)
tree7ed5ac9113a026e45d796868bb006cb53f932d44 /drivers/staging/rt2860/sta/assoc.c
parent7d5efd61999c8d0e63f995339f76bbfc653b645a (diff)
downloadop-kernel-dev-e82bf85ec92e9cb2db9b226c1a29e2219b489b94.zip
op-kernel-dev-e82bf85ec92e9cb2db9b226c1a29e2219b489b94.tar.gz
Staging: rt2860: remove dependency on WIRELESS_EXT version
As the driver is in mainline now we can remove such dependencies. WIRELESS_EXT is 22 now. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/sta/assoc.c')
-rw-r--r--drivers/staging/rt2860/sta/assoc.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index a0734c6..4873159 100644
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -1503,7 +1503,6 @@ int wext_notify_event_assoc(
union iwreq_data wrqu;
char custom[IW_CUSTOM_MAX] = {0};
-#if WIRELESS_EXT > 17
if (pAd->StaCfg.ReqVarIELen <= IW_CUSTOM_MAX)
{
wrqu.data.length = pAd->StaCfg.ReqVarIELen;
@@ -1512,19 +1511,6 @@ int wext_notify_event_assoc(
}
else
DBGPRINT(RT_DEBUG_TRACE, ("pAd->StaCfg.ReqVarIELen > MAX_CUSTOM_LEN\n"));
-#else
- if (((pAd->StaCfg.ReqVarIELen*2) + 17) <= IW_CUSTOM_MAX)
- {
- UCHAR idx;
- wrqu.data.length = (pAd->StaCfg.ReqVarIELen*2) + 17;
- sprintf(custom, "ASSOCINFO(ReqIEs=");
- for (idx=0; idx<pAd->StaCfg.ReqVarIELen; idx++)
- sprintf(custom + strlen(custom), "%02x", pAd->StaCfg.ReqVarIEs[idx]);
- wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, custom);
- }
- else
- DBGPRINT(RT_DEBUG_TRACE, ("(pAd->StaCfg.ReqVarIELen*2) + 17 > MAX_CUSTOM_LEN\n"));
-#endif
return 0;
OpenPOWER on IntegriCloud