diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6655/device.h | 4 | ||||
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 20 | ||||
-rw-r--r-- | drivers/staging/vt6655/hostap.h | 8 | ||||
-rw-r--r-- | drivers/staging/vt6655/iwctl.c | 77 | ||||
-rw-r--r-- | drivers/staging/vt6655/iwctl.h | 83 |
5 files changed, 2 insertions, 190 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 264d1bb2ff7..6726b2c9e94 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h | |||
@@ -70,16 +70,12 @@ | |||
70 | #endif | 70 | #endif |
71 | /* Include Wireless Extension definition and check version - Jean II */ | 71 | /* Include Wireless Extension definition and check version - Jean II */ |
72 | #include <linux/wireless.h> | 72 | #include <linux/wireless.h> |
73 | #if WIRELESS_EXT > 12 | ||
74 | #include <net/iw_handler.h> // New driver API | 73 | #include <net/iw_handler.h> // New driver API |
75 | #endif /* WIRELESS_EXT > 12 */ | ||
76 | 74 | ||
77 | //2008-0409-07, <Add> by Einsn Liu | 75 | //2008-0409-07, <Add> by Einsn Liu |
78 | #if WIRELESS_EXT > 17 | ||
79 | #ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | 76 | #ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT |
80 | #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | 77 | #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT |
81 | #endif | 78 | #endif |
82 | #endif | ||
83 | //2008-4-14<add> by chester for led issue | 79 | //2008-4-14<add> by chester for led issue |
84 | //#define FOR_LED_ON_NOTEBOOK | 80 | //#define FOR_LED_ON_NOTEBOOK |
85 | // | 81 | // |
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 0a11d7fd8aa..88460263e07 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
@@ -3412,7 +3412,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { | |||
3412 | switch(cmd) { | 3412 | switch(cmd) { |
3413 | 3413 | ||
3414 | #ifdef WIRELESS_EXT | 3414 | #ifdef WIRELESS_EXT |
3415 | //#if WIRELESS_EXT < 13 | ||
3416 | 3415 | ||
3417 | case SIOCGIWNAME: | 3416 | case SIOCGIWNAME: |
3418 | rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL); | 3417 | rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL); |
@@ -3588,7 +3587,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { | |||
3588 | } | 3587 | } |
3589 | break; | 3588 | break; |
3590 | 3589 | ||
3591 | #if WIRELESS_EXT > 9 | ||
3592 | // Get the current Tx-Power | 3590 | // Get the current Tx-Power |
3593 | case SIOCGIWTXPOW: | 3591 | case SIOCGIWTXPOW: |
3594 | DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n"); | 3592 | DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n"); |
@@ -3600,9 +3598,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { | |||
3600 | rc = -EOPNOTSUPP; | 3598 | rc = -EOPNOTSUPP; |
3601 | break; | 3599 | break; |
3602 | 3600 | ||
3603 | #endif // WIRELESS_EXT > 9 | ||
3604 | |||
3605 | #if WIRELESS_EXT > 10 | ||
3606 | case SIOCSIWRETRY: | 3601 | case SIOCSIWRETRY: |
3607 | 3602 | ||
3608 | rc = iwctl_siwretry(dev, NULL, &(wrq->u.retry), NULL); | 3603 | rc = iwctl_siwretry(dev, NULL, &(wrq->u.retry), NULL); |
@@ -3613,8 +3608,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { | |||
3613 | rc = iwctl_giwretry(dev, NULL, &(wrq->u.retry), NULL); | 3608 | rc = iwctl_giwretry(dev, NULL, &(wrq->u.retry), NULL); |
3614 | break; | 3609 | break; |
3615 | 3610 | ||
3616 | #endif // WIRELESS_EXT > 10 | ||
3617 | |||
3618 | // Get range of parameters | 3611 | // Get range of parameters |
3619 | case SIOCGIWRANGE: | 3612 | case SIOCGIWRANGE: |
3620 | 3613 | ||
@@ -3701,7 +3694,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { | |||
3701 | break; | 3694 | break; |
3702 | 3695 | ||
3703 | 3696 | ||
3704 | //#endif // WIRELESS_EXT < 13 | ||
3705 | //2008-0409-07, <Add> by Einsn Liu | 3697 | //2008-0409-07, <Add> by Einsn Liu |
3706 | #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | 3698 | #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT |
3707 | case SIOCSIWAUTH: | 3699 | case SIOCSIWAUTH: |
@@ -3799,20 +3791,12 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { | |||
3799 | case IOCTL_CMD_HOSTAPD: | 3791 | case IOCTL_CMD_HOSTAPD: |
3800 | 3792 | ||
3801 | 3793 | ||
3802 | #if WIRELESS_EXT > 8 | 3794 | rc = hostap_ioctl(pDevice, &wrq->u.data); |
3803 | rc = hostap_ioctl(pDevice, &wrq->u.data); | ||
3804 | #else // WIRELESS_EXT > 8 | ||
3805 | rc = hostap_ioctl(pDevice, (struct iw_point *) &wrq->u.data); | ||
3806 | #endif // WIRELESS_EXT > 8 | ||
3807 | break; | 3795 | break; |
3808 | 3796 | ||
3809 | case IOCTL_CMD_WPA: | 3797 | case IOCTL_CMD_WPA: |
3810 | 3798 | ||
3811 | #if WIRELESS_EXT > 8 | 3799 | rc = wpa_ioctl(pDevice, &wrq->u.data); |
3812 | rc = wpa_ioctl(pDevice, &wrq->u.data); | ||
3813 | #else // WIRELESS_EXT > 8 | ||
3814 | rc = wpa_ioctl(pDevice, (struct iw_point *) &wrq->u.data); | ||
3815 | #endif // WIRELESS_EXT > 8 | ||
3816 | break; | 3800 | break; |
3817 | 3801 | ||
3818 | case SIOCETHTOOL: | 3802 | case SIOCETHTOOL: |
diff --git a/drivers/staging/vt6655/hostap.h b/drivers/staging/vt6655/hostap.h index 1fcb2f0788b..c5ad3494b6e 100644 --- a/drivers/staging/vt6655/hostap.h +++ b/drivers/staging/vt6655/hostap.h | |||
@@ -37,14 +37,6 @@ | |||
37 | 37 | ||
38 | /*--------------------- Export Definitions -------------------------*/ | 38 | /*--------------------- Export Definitions -------------------------*/ |
39 | 39 | ||
40 | #if WIRELESS_EXT < 9 | ||
41 | struct iw_point { | ||
42 | caddr_t pointer; | ||
43 | __u16 length; | ||
44 | __u16 flags; | ||
45 | }; | ||
46 | #endif /* WIRELESS_EXT < 9 */ | ||
47 | |||
48 | #define WLAN_RATE_1M BIT0 | 40 | #define WLAN_RATE_1M BIT0 |
49 | #define WLAN_RATE_2M BIT1 | 41 | #define WLAN_RATE_2M BIT1 |
50 | #define WLAN_RATE_5M5 BIT2 | 42 | #define WLAN_RATE_5M5 BIT2 |
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 4d5a1da8edf..b7c75a6b37e 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c | |||
@@ -68,9 +68,7 @@ | |||
68 | #endif | 68 | #endif |
69 | #endif | 69 | #endif |
70 | 70 | ||
71 | #if WIRELESS_EXT > 12 | ||
72 | #include <net/iw_handler.h> | 71 | #include <net/iw_handler.h> |
73 | #endif | ||
74 | extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester | 72 | extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester |
75 | 73 | ||
76 | /*--------------------- Static Definitions -------------------------*/ | 74 | /*--------------------- Static Definitions -------------------------*/ |
@@ -109,8 +107,6 @@ static int msglevel =MSG_LEVEL_INFO; | |||
109 | 107 | ||
110 | #ifdef WIRELESS_EXT | 108 | #ifdef WIRELESS_EXT |
111 | 109 | ||
112 | #if WIRELESS_EXT > 12 | ||
113 | |||
114 | struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev) | 110 | struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev) |
115 | { | 111 | { |
116 | PSDevice pDevice = netdev_priv(dev); | 112 | PSDevice pDevice = netdev_priv(dev); |
@@ -156,8 +152,6 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev) | |||
156 | return &pDevice->wstats; | 152 | return &pDevice->wstats; |
157 | } | 153 | } |
158 | 154 | ||
159 | #endif | ||
160 | |||
161 | 155 | ||
162 | 156 | ||
163 | /*------------------------------------------------------------------*/ | 157 | /*------------------------------------------------------------------*/ |
@@ -198,7 +192,6 @@ int iwctl_giwnwid(struct net_device *dev, | |||
198 | //return 0; | 192 | //return 0; |
199 | return -EOPNOTSUPP; | 193 | return -EOPNOTSUPP; |
200 | } | 194 | } |
201 | #if WIRELESS_EXT > 13 | ||
202 | 195 | ||
203 | /* | 196 | /* |
204 | * Wireless Handler : set scan | 197 | * Wireless Handler : set scan |
@@ -286,9 +279,7 @@ int iwctl_giwscan(struct net_device *dev, | |||
286 | char *current_val = NULL; | 279 | char *current_val = NULL; |
287 | struct iw_event iwe; | 280 | struct iw_event iwe; |
288 | long ldBm; | 281 | long ldBm; |
289 | #if WIRELESS_EXT > 14 | ||
290 | char buf[MAX_WPA_IE_LEN * 2 + 30]; | 282 | char buf[MAX_WPA_IE_LEN * 2 + 30]; |
291 | #endif /* WIRELESS_EXT > 14 */ | ||
292 | 283 | ||
293 | 284 | ||
294 | DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n"); | 285 | DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n"); |
@@ -397,14 +388,12 @@ int iwctl_giwscan(struct net_device *dev, | |||
397 | if((current_val - current_ev) > IW_EV_LCP_LEN) | 388 | if((current_val - current_ev) > IW_EV_LCP_LEN) |
398 | current_ev = current_val; | 389 | current_ev = current_val; |
399 | 390 | ||
400 | #if WIRELESS_EXT > 14 | ||
401 | memset(&iwe, 0, sizeof(iwe)); | 391 | memset(&iwe, 0, sizeof(iwe)); |
402 | iwe.cmd = IWEVCUSTOM; | 392 | iwe.cmd = IWEVCUSTOM; |
403 | sprintf(buf, "bcn_int=%d", pBSS->wBeaconInterval); | 393 | sprintf(buf, "bcn_int=%d", pBSS->wBeaconInterval); |
404 | iwe.u.data.length = strlen(buf); | 394 | iwe.u.data.length = strlen(buf); |
405 | current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf); | 395 | current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf); |
406 | 396 | ||
407 | #if WIRELESS_EXT > 17 | ||
408 | if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) { | 397 | if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) { |
409 | memset(&iwe, 0, sizeof(iwe)); | 398 | memset(&iwe, 0, sizeof(iwe)); |
410 | iwe.cmd = IWEVGENIE; | 399 | iwe.cmd = IWEVGENIE; |
@@ -419,33 +408,6 @@ int iwctl_giwscan(struct net_device *dev, | |||
419 | current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, pBSS->byRSNIE); | 408 | current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, pBSS->byRSNIE); |
420 | } | 409 | } |
421 | 410 | ||
422 | #else // WIRELESS_EXT > 17 | ||
423 | if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) { | ||
424 | u8 *p = buf; | ||
425 | memset(&iwe, 0, sizeof(iwe)); | ||
426 | iwe.cmd = IWEVCUSTOM; | ||
427 | p += sprintf(p, "wpa_ie="); | ||
428 | for (ii = 0; ii < pBSS->wWPALen; ii++) { | ||
429 | p += sprintf(p, "%02x", pBSS->byWPAIE[ii]); | ||
430 | } | ||
431 | iwe.u.data.length = strlen(buf); | ||
432 | current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf); | ||
433 | } | ||
434 | |||
435 | |||
436 | if ((pBSS->wRSNLen > 0) && (pBSS->wRSNLen <= MAX_WPA_IE_LEN)) { | ||
437 | u8 *p = buf; | ||
438 | memset(&iwe, 0, sizeof(iwe)); | ||
439 | iwe.cmd = IWEVCUSTOM; | ||
440 | p += sprintf(p, "rsn_ie="); | ||
441 | for (ii = 0; ii < pBSS->wRSNLen; ii++) { | ||
442 | p += sprintf(p, "%02x", pBSS->byRSNIE[ii]); | ||
443 | } | ||
444 | iwe.u.data.length = strlen(buf); | ||
445 | current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf); | ||
446 | } | ||
447 | #endif | ||
448 | #endif | ||
449 | } | 411 | } |
450 | }// for | 412 | }// for |
451 | 413 | ||
@@ -454,8 +416,6 @@ int iwctl_giwscan(struct net_device *dev, | |||
454 | 416 | ||
455 | } | 417 | } |
456 | 418 | ||
457 | #endif /* WIRELESS_EXT > 13 */ | ||
458 | |||
459 | 419 | ||
460 | /* | 420 | /* |
461 | * Wireless Handler : set frequence or channel | 421 | * Wireless Handler : set frequence or channel |
@@ -708,12 +668,9 @@ int iwctl_giwrange(struct net_device *dev, | |||
708 | // 4 keys are allowed | 668 | // 4 keys are allowed |
709 | range->max_encoding_tokens = 4; | 669 | range->max_encoding_tokens = 4; |
710 | 670 | ||
711 | #if WIRELESS_EXT > 17 | ||
712 | range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | | 671 | range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | |
713 | IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; | 672 | IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; |
714 | #endif | ||
715 | 673 | ||
716 | #if WIRELESS_EXT > 9 | ||
717 | range->min_pmp = 0; | 674 | range->min_pmp = 0; |
718 | range->max_pmp = 1000000;// 1 secs | 675 | range->max_pmp = 1000000;// 1 secs |
719 | range->min_pmt = 0; | 676 | range->min_pmt = 0; |
@@ -727,8 +684,6 @@ int iwctl_giwrange(struct net_device *dev, | |||
727 | range->txpower[0] = 100; | 684 | range->txpower[0] = 100; |
728 | range->num_txpower = 1; | 685 | range->num_txpower = 1; |
729 | range->txpower_capa = IW_TXPOW_MWATT; | 686 | range->txpower_capa = IW_TXPOW_MWATT; |
730 | #endif // WIRELESS_EXT > 9 | ||
731 | #if WIRELESS_EXT > 10 | ||
732 | range->we_version_source = SUPPORTED_WIRELESS_EXT; | 687 | range->we_version_source = SUPPORTED_WIRELESS_EXT; |
733 | range->we_version_compiled = WIRELESS_EXT; | 688 | range->we_version_compiled = WIRELESS_EXT; |
734 | range->retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME; | 689 | range->retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME; |
@@ -738,15 +693,12 @@ int iwctl_giwrange(struct net_device *dev, | |||
738 | range->max_retry = 65535; | 693 | range->max_retry = 65535; |
739 | range->min_r_time = 1024; | 694 | range->min_r_time = 1024; |
740 | range->max_r_time = 65535 * 1024; | 695 | range->max_r_time = 65535 * 1024; |
741 | #endif // WIRELESS_EXT > 10 | ||
742 | #if WIRELESS_EXT > 11 | ||
743 | // Experimental measurements - boundary 11/5.5 Mb/s | 696 | // Experimental measurements - boundary 11/5.5 Mb/s |
744 | // Note : with or without the (local->rssi), results | 697 | // Note : with or without the (local->rssi), results |
745 | // are somewhat different. - Jean II | 698 | // are somewhat different. - Jean II |
746 | range->avg_qual.qual = 6; | 699 | range->avg_qual.qual = 6; |
747 | range->avg_qual.level = 176; // -80 dBm | 700 | range->avg_qual.level = 176; // -80 dBm |
748 | range->avg_qual.noise = 0; | 701 | range->avg_qual.noise = 0; |
749 | #endif // WIRELESS_EXT > 11 | ||
750 | } | 702 | } |
751 | 703 | ||
752 | 704 | ||
@@ -1004,13 +956,8 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) { | |||
1004 | 956 | ||
1005 | DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set essid = %s \n", pItemSSID->abySSID); | 957 | DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set essid = %s \n", pItemSSID->abySSID); |
1006 | /* | 958 | /* |
1007 | #if WIRELESS_EXT < 21 | ||
1008 | DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWESSID1 \n"); | ||
1009 | pItemSSID->len = wrq->length - 1; | ||
1010 | #else | ||
1011 | DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWESSID2 \n"); | 959 | DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWESSID2 \n"); |
1012 | pItemSSID->len = wrq->length; | 960 | pItemSSID->len = wrq->length; |
1013 | #endif | ||
1014 | */ | 961 | */ |
1015 | } | 962 | } |
1016 | 963 | ||
@@ -1049,11 +996,7 @@ int iwctl_giwessid(struct net_device *dev, | |||
1049 | extra[pItemSSID->len] = '\0'; | 996 | extra[pItemSSID->len] = '\0'; |
1050 | wrq->length = pItemSSID->len + 1; | 997 | wrq->length = pItemSSID->len + 1; |
1051 | //2008-0409-03, <Add> by Einsn Liu | 998 | //2008-0409-03, <Add> by Einsn Liu |
1052 | #if WIRELESS_EXT < 21 | ||
1053 | wrq->length = pItemSSID->len + 1; | ||
1054 | #else | ||
1055 | wrq->length = pItemSSID->len; | 999 | wrq->length = pItemSSID->len; |
1056 | #endif | ||
1057 | wrq->flags = 1; // active | 1000 | wrq->flags = 1; // active |
1058 | 1001 | ||
1059 | 1002 | ||
@@ -2217,8 +2160,6 @@ int iwctl_siwmlme(struct net_device *dev, | |||
2217 | */ | 2160 | */ |
2218 | 2161 | ||
2219 | 2162 | ||
2220 | #if WIRELESS_EXT > 12 | ||
2221 | |||
2222 | /* | 2163 | /* |
2223 | static const iw_handler iwctl_handler[] = | 2164 | static const iw_handler iwctl_handler[] = |
2224 | { | 2165 | { |
@@ -2246,13 +2187,8 @@ static const iw_handler iwctl_handler[] = | |||
2246 | (iw_handler) iwctl_giwap, // SIOCGIWAP | 2187 | (iw_handler) iwctl_giwap, // SIOCGIWAP |
2247 | (iw_handler) NULL, // -- hole -- 0x16 | 2188 | (iw_handler) NULL, // -- hole -- 0x16 |
2248 | (iw_handler) iwctl_giwaplist, // SIOCGIWAPLIST | 2189 | (iw_handler) iwctl_giwaplist, // SIOCGIWAPLIST |
2249 | #if WIRELESS_EXT > 13 | ||
2250 | (iw_handler) iwctl_siwscan, // SIOCSIWSCAN | 2190 | (iw_handler) iwctl_siwscan, // SIOCSIWSCAN |
2251 | (iw_handler) iwctl_giwscan, // SIOCGIWSCAN | 2191 | (iw_handler) iwctl_giwscan, // SIOCGIWSCAN |
2252 | #else | ||
2253 | (iw_handler) NULL, | ||
2254 | (iw_handler) NULL, | ||
2255 | #endif | ||
2256 | (iw_handler) iwctl_siwessid, // SIOCSIWESSID | 2192 | (iw_handler) iwctl_siwessid, // SIOCSIWESSID |
2257 | (iw_handler) iwctl_giwessid, // SIOCGIWESSID | 2193 | (iw_handler) iwctl_giwessid, // SIOCGIWESSID |
2258 | (iw_handler) NULL, // SIOCSIWNICKN | 2194 | (iw_handler) NULL, // SIOCSIWNICKN |
@@ -2273,7 +2209,6 @@ static const iw_handler iwctl_handler[] = | |||
2273 | (iw_handler) iwctl_giwencode, // SIOCGIWENCODE | 2209 | (iw_handler) iwctl_giwencode, // SIOCGIWENCODE |
2274 | (iw_handler) iwctl_siwpower, // SIOCSIWPOWER | 2210 | (iw_handler) iwctl_siwpower, // SIOCSIWPOWER |
2275 | (iw_handler) iwctl_giwpower, // SIOCGIWPOWER | 2211 | (iw_handler) iwctl_giwpower, // SIOCGIWPOWER |
2276 | #if WIRELESS_EXT > 17 | ||
2277 | (iw_handler) NULL, // -- hole -- | 2212 | (iw_handler) NULL, // -- hole -- |
2278 | (iw_handler) NULL, // -- hole -- | 2213 | (iw_handler) NULL, // -- hole -- |
2279 | (iw_handler) iwctl_siwgenie, // SIOCSIWGENIE | 2214 | (iw_handler) iwctl_siwgenie, // SIOCSIWGENIE |
@@ -2284,7 +2219,6 @@ static const iw_handler iwctl_handler[] = | |||
2284 | (iw_handler) iwctl_giwencodeext, // SIOCGIWENCODEEXT | 2219 | (iw_handler) iwctl_giwencodeext, // SIOCGIWENCODEEXT |
2285 | (iw_handler) NULL, // SIOCSIWPMKSA | 2220 | (iw_handler) NULL, // SIOCSIWPMKSA |
2286 | (iw_handler) NULL, // -- hole -- | 2221 | (iw_handler) NULL, // -- hole -- |
2287 | #endif // WIRELESS_EXT > 17 | ||
2288 | 2222 | ||
2289 | }; | 2223 | }; |
2290 | */ | 2224 | */ |
@@ -2315,13 +2249,8 @@ static const iw_handler iwctl_handler[] = | |||
2315 | (iw_handler) NULL, // SIOCGIWAP | 2249 | (iw_handler) NULL, // SIOCGIWAP |
2316 | (iw_handler) NULL, // -- hole -- 0x16 | 2250 | (iw_handler) NULL, // -- hole -- 0x16 |
2317 | (iw_handler) NULL, // SIOCGIWAPLIST | 2251 | (iw_handler) NULL, // SIOCGIWAPLIST |
2318 | #if WIRELESS_EXT > 13 | ||
2319 | (iw_handler) iwctl_siwscan, // SIOCSIWSCAN | 2252 | (iw_handler) iwctl_siwscan, // SIOCSIWSCAN |
2320 | (iw_handler) iwctl_giwscan, // SIOCGIWSCAN | 2253 | (iw_handler) iwctl_giwscan, // SIOCGIWSCAN |
2321 | #else | ||
2322 | (iw_handler) NULL, | ||
2323 | (iw_handler) NULL, | ||
2324 | #endif | ||
2325 | (iw_handler) NULL, // SIOCSIWESSID | 2254 | (iw_handler) NULL, // SIOCSIWESSID |
2326 | (iw_handler) NULL, // SIOCGIWESSID | 2255 | (iw_handler) NULL, // SIOCGIWESSID |
2327 | (iw_handler) NULL, // SIOCSIWNICKN | 2256 | (iw_handler) NULL, // SIOCSIWNICKN |
@@ -2344,7 +2273,6 @@ static const iw_handler iwctl_handler[] = | |||
2344 | (iw_handler) NULL, // SIOCGIWPOWER | 2273 | (iw_handler) NULL, // SIOCGIWPOWER |
2345 | 2274 | ||
2346 | //2008-0409-07, <Add> by Einsn Liu | 2275 | //2008-0409-07, <Add> by Einsn Liu |
2347 | #if WIRELESS_EXT > 17 | ||
2348 | (iw_handler) NULL, // -- hole -- | 2276 | (iw_handler) NULL, // -- hole -- |
2349 | (iw_handler) NULL, // -- hole -- | 2277 | (iw_handler) NULL, // -- hole -- |
2350 | (iw_handler) NULL, // SIOCSIWGENIE | 2278 | (iw_handler) NULL, // SIOCSIWGENIE |
@@ -2355,7 +2283,6 @@ static const iw_handler iwctl_handler[] = | |||
2355 | (iw_handler) NULL, // SIOCGIWENCODEEXT | 2283 | (iw_handler) NULL, // SIOCGIWENCODEEXT |
2356 | (iw_handler) NULL, // SIOCSIWPMKSA | 2284 | (iw_handler) NULL, // SIOCSIWPMKSA |
2357 | (iw_handler) NULL, // -- hole -- | 2285 | (iw_handler) NULL, // -- hole -- |
2358 | #endif // WIRELESS_EXT > 17 | ||
2359 | }; | 2286 | }; |
2360 | 2287 | ||
2361 | 2288 | ||
@@ -2375,9 +2302,7 @@ struct iw_priv_args iwctl_private_args[] = { | |||
2375 | 2302 | ||
2376 | const struct iw_handler_def iwctl_handler_def = | 2303 | const struct iw_handler_def iwctl_handler_def = |
2377 | { | 2304 | { |
2378 | #if WIRELESS_EXT > 16 | ||
2379 | .get_wireless_stats = &iwctl_get_wireless_stats, | 2305 | .get_wireless_stats = &iwctl_get_wireless_stats, |
2380 | #endif | ||
2381 | .num_standard = sizeof(iwctl_handler)/sizeof(iw_handler), | 2306 | .num_standard = sizeof(iwctl_handler)/sizeof(iw_handler), |
2382 | // .num_private = sizeof(iwctl_private_handler)/sizeof(iw_handler), | 2307 | // .num_private = sizeof(iwctl_private_handler)/sizeof(iw_handler), |
2383 | // .num_private_args = sizeof(iwctl_private_args)/sizeof(struct iw_priv_args), | 2308 | // .num_private_args = sizeof(iwctl_private_args)/sizeof(struct iw_priv_args), |
@@ -2391,7 +2316,5 @@ const struct iw_handler_def iwctl_handler_def = | |||
2391 | }; | 2316 | }; |
2392 | 2317 | ||
2393 | 2318 | ||
2394 | #endif // WIRELESS_EXT > 12 | ||
2395 | |||
2396 | 2319 | ||
2397 | #endif // WIRELESS_EXT | 2320 | #endif // WIRELESS_EXT |
diff --git a/drivers/staging/vt6655/iwctl.h b/drivers/staging/vt6655/iwctl.h index 07554e14d5f..147af9d5cb2 100644 --- a/drivers/staging/vt6655/iwctl.h +++ b/drivers/staging/vt6655/iwctl.h | |||
@@ -50,85 +50,6 @@ extern "C" { /* Assume C declarations for C++ */ | |||
50 | #endif /* __cplusplus */ | 50 | #endif /* __cplusplus */ |
51 | 51 | ||
52 | 52 | ||
53 | #if WIRELESS_EXT < 18 | ||
54 | |||
55 | |||
56 | #define SIOCSIWMLME 0x8B16 | ||
57 | #define SIOCSIWGENIE 0x8B30 | ||
58 | |||
59 | // WPA : Authentication mode parameters | ||
60 | #define SIOCSIWAUTH 0x8B32 | ||
61 | #define SIOCGIWAUTH 0x8B33 | ||
62 | |||
63 | // WPA : Extended version of encoding configuration | ||
64 | #define SIOCSIWENCODEEXT 0x8B34 | ||
65 | #define SIOCGIWENCODEEXT 0x8B35 | ||
66 | |||
67 | #define IW_AUTH_WPA_VERSION 0 | ||
68 | #define IW_AUTH_CIPHER_PAIRWISE 1 | ||
69 | #define IW_AUTH_CIPHER_GROUP 2 | ||
70 | #define IW_AUTH_KEY_MGMT 3 | ||
71 | #define IW_AUTH_TKIP_COUNTERMEASURES 4 | ||
72 | #define IW_AUTH_DROP_UNENCRYPTED 5 | ||
73 | #define IW_AUTH_80211_AUTH_ALG 6 | ||
74 | #define IW_AUTH_WPA_ENABLED 7 | ||
75 | #define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 | ||
76 | #define IW_AUTH_ROAMING_CONTROL 9 | ||
77 | #define IW_AUTH_PRIVACY_INVOKED 10 | ||
78 | |||
79 | #define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 | ||
80 | #define IW_AUTH_WPA_VERSION_WPA 0x00000002 | ||
81 | #define IW_AUTH_WPA_VERSION_WPA2 0x00000004 | ||
82 | |||
83 | #define IW_AUTH_CIPHER_NONE 0x00000001 | ||
84 | #define IW_AUTH_CIPHER_WEP40 0x00000002 | ||
85 | #define IW_AUTH_CIPHER_TKIP 0x00000004 | ||
86 | #define IW_AUTH_CIPHER_CCMP 0x00000008 | ||
87 | #define IW_AUTH_CIPHER_WEP104 0x00000010 | ||
88 | |||
89 | #define IW_AUTH_KEY_MGMT_802_1X 1 | ||
90 | #define IW_AUTH_KEY_MGMT_PSK 2 | ||
91 | |||
92 | #define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 | ||
93 | #define IW_AUTH_ALG_SHARED_KEY 0x00000002 | ||
94 | #define IW_AUTH_ALG_LEAP 0x00000004 | ||
95 | |||
96 | #define IW_AUTH_ROAMING_ENABLE 0 | ||
97 | #define IW_AUTH_ROAMING_DISABLE 1 | ||
98 | |||
99 | #define IW_ENCODE_SEQ_MAX_SIZE 8 | ||
100 | |||
101 | #define IW_ENCODE_ALG_NONE 0 | ||
102 | #define IW_ENCODE_ALG_WEP 1 | ||
103 | #define IW_ENCODE_ALG_TKIP 2 | ||
104 | #define IW_ENCODE_ALG_CCMP 3 | ||
105 | |||
106 | |||
107 | struct iw_encode_ext | ||
108 | { | ||
109 | __u32 ext_flags; // IW_ENCODE_EXT_* | ||
110 | __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; // LSB first | ||
111 | __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; // LSB first | ||
112 | struct sockaddr addr; // ff:ff:ff:ff:ff:ff for broadcast/multicast | ||
113 | // (group) keys or unicast address for | ||
114 | // individual keys | ||
115 | __u16 alg; // IW_ENCODE_ALG_* | ||
116 | __u16 key_len; | ||
117 | __u8 key[0]; | ||
118 | }; | ||
119 | |||
120 | |||
121 | struct iw_mlme | ||
122 | { | ||
123 | __u16 cmd; /* IW_MLME_* */ | ||
124 | __u16 reason_code; | ||
125 | struct sockaddr addr; | ||
126 | }; | ||
127 | |||
128 | #endif // WIRELESS_EXT < 18 | ||
129 | |||
130 | |||
131 | |||
132 | #ifdef WIRELESS_EXT | 53 | #ifdef WIRELESS_EXT |
133 | 54 | ||
134 | struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev); | 55 | struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev); |
@@ -312,12 +233,8 @@ int iwctl_siwmlme(struct net_device *dev, | |||
312 | 233 | ||
313 | #endif | 234 | #endif |
314 | 235 | ||
315 | #if WIRELESS_EXT > 12 | ||
316 | extern const struct iw_handler_def iwctl_handler_def; | 236 | extern const struct iw_handler_def iwctl_handler_def; |
317 | extern const struct iw_priv_args iwctl_private_args; | 237 | extern const struct iw_priv_args iwctl_private_args; |
318 | #else | ||
319 | struct iw_request_info {}; | ||
320 | #endif //WIRELESS_EXT > 12 | ||
321 | 238 | ||
322 | #ifdef __cplusplus | 239 | #ifdef __cplusplus |
323 | } /* End of extern "C" { */ | 240 | } /* End of extern "C" { */ |