Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 162019
b: refs/heads/master
c: 70f38b1
h: refs/heads/master
i:
  162017: e213c1a
  162015: c590df7
v: v3
  • Loading branch information
Alexander Beregalov authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent c904a3f commit 3f14114
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 224 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: edb3a9507c898ae5f71bbaae932e66801318e90b
refs/heads/master: 70f38b105311c8e19a7fe89811d13ef81690072c
7 changes: 0 additions & 7 deletions trunk/drivers/staging/vt6656/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,11 @@
#endif
/* Include Wireless Extension definition and check version - Jean II */
#include <linux/wireless.h>
#if WIRELESS_EXT > 12
#include <net/iw_handler.h> // New driver API
#endif /* WIRELESS_EXT > 12 */

//2008-0409-07, <Add> by Einsn Liu
#if WIRELESS_EXT > 17
#ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#endif
#endif

//2007-0920-01<Add>by MikeLiu
#ifndef SndEvt_ToAPI
Expand Down Expand Up @@ -910,9 +905,7 @@ typedef struct __device_info {
#endif
UINT uChannel;

#ifdef WIRELESS_EXT
struct iw_statistics wstats; // wireless stats
#endif /* WIRELESS_EXT */
BOOL bCommit;

} DEVICE_INFO, *PSDevice;
Expand Down
8 changes: 0 additions & 8 deletions trunk/drivers/staging/vt6656/hostap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@

/*--------------------- Export Definitions -------------------------*/

#if WIRELESS_EXT < 9
struct iw_point {
caddr_t pointer;
__u16 length;
__u16 flags;
};
#endif /* WIRELESS_EXT < 9 */

#define WLAN_RATE_1M BIT0
#define WLAN_RATE_2M BIT1
#define WLAN_RATE_5M5 BIT2
Expand Down
84 changes: 0 additions & 84 deletions trunk/drivers/staging/vt6656/iwctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@
#endif
#endif

#if WIRELESS_EXT > 12
#include <net/iw_handler.h>
#endif


/*--------------------- Static Definitions -------------------------*/
Expand All @@ -82,8 +80,6 @@
#define SUPPORTED_WIRELESS_EXT 17
#endif

#ifdef WIRELESS_EXT

static const long frequency_list[] = {
2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980,
Expand All @@ -92,8 +88,6 @@ static const long frequency_list[] = {
5700, 5745, 5765, 5785, 5805, 5825
};

#endif


/*--------------------- Static Classes ----------------------------*/

Expand All @@ -107,10 +101,6 @@ static int msglevel =MSG_LEVEL_INFO;

/*--------------------- Export Variables --------------------------*/

#ifdef WIRELESS_EXT

#if WIRELESS_EXT > 12

struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
{
PSDevice pDevice = netdev_priv(dev);
Expand Down Expand Up @@ -157,8 +147,6 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
return &pDevice->wstats;
}

#endif



/*------------------------------------------------------------------*/
Expand Down Expand Up @@ -207,8 +195,6 @@ int iwctl_giwnwid(struct net_device *dev,
//return 0;
return -EOPNOTSUPP;
}
#if WIRELESS_EXT > 13

/*
* Wireless Handler : set scan
*/
Expand Down Expand Up @@ -309,9 +295,7 @@ int iwctl_giwscan(struct net_device *dev,
char *current_val = NULL;
struct iw_event iwe;
long ldBm;
#if WIRELESS_EXT > 14
char buf[MAX_WPA_IE_LEN * 2 + 30];
#endif /* WIRELESS_EXT > 14 */

//2008-0409-02, <Mark> by Einsn Liu
/*
Expand Down Expand Up @@ -457,14 +441,12 @@ int iwctl_giwscan(struct net_device *dev,
if((current_val - current_ev) > IW_EV_LCP_LEN)
current_ev = current_val;

#if WIRELESS_EXT > 14
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVCUSTOM;
sprintf(buf, "bcn_int=%d", pBSS->wBeaconInterval);
iwe.u.data.length = strlen(buf);
current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf);

#if WIRELESS_EXT > 17
if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) {
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVGENIE;
Expand All @@ -479,33 +461,6 @@ int iwctl_giwscan(struct net_device *dev,
current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, pBSS->byRSNIE);
}

#else // WIRELESS_EXT > 17
if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) {
u8 *p = buf;
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVCUSTOM;
p += sprintf(p, "wpa_ie=");
for (ii = 0; ii < pBSS->wWPALen; ii++) {
p += sprintf(p, "%02x", pBSS->byWPAIE[ii]);
}
iwe.u.data.length = strlen(buf);
current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf);
}


if ((pBSS->wRSNLen > 0) && (pBSS->wRSNLen <= MAX_WPA_IE_LEN)) {
u8 *p = buf;
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVCUSTOM;
p += sprintf(p, "rsn_ie=");
for (ii = 0; ii < pBSS->wRSNLen; ii++) {
p += sprintf(p, "%02x", pBSS->byRSNIE[ii]);
}
iwe.u.data.length = strlen(buf);
current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, buf);
}
#endif
#endif
}
}// for

Expand All @@ -514,8 +469,6 @@ int iwctl_giwscan(struct net_device *dev,

}

#endif /* WIRELESS_EXT > 13 */


/*
* Wireless Handler : set frequence or channel
Expand Down Expand Up @@ -772,12 +725,9 @@ int iwctl_giwrange(struct net_device *dev,
// 4 keys are allowed
range->max_encoding_tokens = 4;

#if WIRELESS_EXT > 17
range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
#endif

#if WIRELESS_EXT > 9
range->min_pmp = 0;
range->max_pmp = 1000000;// 1 secs
range->min_pmt = 0;
Expand All @@ -791,8 +741,6 @@ int iwctl_giwrange(struct net_device *dev,
range->txpower[0] = 100;
range->num_txpower = 1;
range->txpower_capa = IW_TXPOW_MWATT;
#endif // WIRELESS_EXT > 9
#if WIRELESS_EXT > 10
range->we_version_source = SUPPORTED_WIRELESS_EXT;
range->we_version_compiled = WIRELESS_EXT;
range->retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;
Expand All @@ -802,15 +750,12 @@ int iwctl_giwrange(struct net_device *dev,
range->max_retry = 65535;
range->min_r_time = 1024;
range->max_r_time = 65535 * 1024;
#endif // WIRELESS_EXT > 10
#if WIRELESS_EXT > 11
// Experimental measurements - boundary 11/5.5 Mb/s
// Note : with or without the (local->rssi), results
// are somewhat different. - Jean II
range->avg_qual.qual = 6;
range->avg_qual.level = 176; // -80 dBm
range->avg_qual.noise = 0;
#endif // WIRELESS_EXT > 11
}


Expand Down Expand Up @@ -1088,11 +1033,7 @@ int iwctl_giwessid(struct net_device *dev,
memcpy(extra, pItemSSID->abySSID , pItemSSID->len);
extra[pItemSSID->len] = '\0';
//2008-0409-03, <Add> by Einsn Liu
#if WIRELESS_EXT < 21
wrq->length = pItemSSID->len + 1;
#else
wrq->length = pItemSSID->len;
#endif
wrq->flags = 1; // active


Expand Down Expand Up @@ -2120,8 +2061,6 @@ int iwctl_siwmlme(struct net_device *dev,
*/


#if WIRELESS_EXT > 12

/*
static const iw_handler iwctl_handler[] =
{
Expand Down Expand Up @@ -2149,13 +2088,8 @@ static const iw_handler iwctl_handler[] =
(iw_handler) iwctl_giwap, // SIOCGIWAP
(iw_handler) NULL, // -- hole -- 0x16
(iw_handler) iwctl_giwaplist, // SIOCGIWAPLIST
#if WIRELESS_EXT > 13
(iw_handler) iwctl_siwscan, // SIOCSIWSCAN
(iw_handler) iwctl_giwscan, // SIOCGIWSCAN
#else
(iw_handler) NULL,
(iw_handler) NULL,
#endif
(iw_handler) iwctl_siwessid, // SIOCSIWESSID
(iw_handler) iwctl_giwessid, // SIOCGIWESSID
(iw_handler) NULL, // SIOCSIWNICKN
Expand All @@ -2176,7 +2110,6 @@ static const iw_handler iwctl_handler[] =
(iw_handler) iwctl_giwencode, // SIOCGIWENCODE
(iw_handler) iwctl_siwpower, // SIOCSIWPOWER
(iw_handler) iwctl_giwpower, // SIOCGIWPOWER
#if WIRELESS_EXT > 17
(iw_handler) NULL, // -- hole --
(iw_handler) NULL, // -- hole --
(iw_handler) iwctl_siwgenie, // SIOCSIWGENIE
Expand All @@ -2187,7 +2120,6 @@ static const iw_handler iwctl_handler[] =
(iw_handler) iwctl_giwencodeext, // SIOCGIWENCODEEXT
(iw_handler) NULL, // SIOCSIWPMKSA
(iw_handler) NULL, // -- hole --
#endif // WIRELESS_EXT > 17
};
*/
Expand Down Expand Up @@ -2218,13 +2150,8 @@ static const iw_handler iwctl_handler[] =
(iw_handler) NULL, // SIOCGIWAP
(iw_handler) NULL, // -- hole -- 0x16
(iw_handler) NULL, // SIOCGIWAPLIST
#if WIRELESS_EXT > 13
(iw_handler) iwctl_siwscan, // SIOCSIWSCAN
(iw_handler) iwctl_giwscan, // SIOCGIWSCAN
#else
(iw_handler) NULL,
(iw_handler) NULL,
#endif
(iw_handler) NULL, // SIOCSIWESSID
(iw_handler) NULL, // SIOCGIWESSID
(iw_handler) NULL, // SIOCSIWNICKN
Expand All @@ -2245,8 +2172,6 @@ static const iw_handler iwctl_handler[] =
(iw_handler) NULL, // SIOCGIWENCODE
(iw_handler) NULL, // SIOCSIWPOWER
(iw_handler) NULL, // SIOCGIWPOWER
//2008-0409-07, <Add> by Einsn Liu
#if WIRELESS_EXT > 17
(iw_handler) NULL, // -- hole --
(iw_handler) NULL, // -- hole --
(iw_handler) NULL, // SIOCSIWGENIE
Expand All @@ -2257,7 +2182,6 @@ static const iw_handler iwctl_handler[] =
(iw_handler) NULL, // SIOCGIWENCODEEXT
(iw_handler) NULL, // SIOCSIWPMKSA
(iw_handler) NULL, // -- hole --
#endif // WIRELESS_EXT > 17
};


Expand All @@ -2277,9 +2201,7 @@ struct iw_priv_args iwctl_private_args[] = {

const struct iw_handler_def iwctl_handler_def =
{
#if WIRELESS_EXT > 16
.get_wireless_stats = &iwctl_get_wireless_stats,
#endif
.num_standard = sizeof(iwctl_handler)/sizeof(iw_handler),
// .num_private = sizeof(iwctl_private_handler)/sizeof(iw_handler),
// .num_private_args = sizeof(iwctl_private_args)/sizeof(struct iw_priv_args),
Expand All @@ -2291,9 +2213,3 @@ const struct iw_handler_def iwctl_handler_def =
.private = NULL,
.private_args = NULL,
};


#endif // WIRELESS_EXT > 12


#endif // WIRELESS_EXT
Loading

0 comments on commit 3f14114

Please sign in to comment.