#include "rt_config.h"
#ifdef DBG
-extern ULONG RTDebugLevel;
+extern unsigned long RTDebugLevel;
#endif
#define NR_WEP_KEYS 4
#define GROUP_KEY_NO 4
-extern UCHAR CipherWpa2Template[];
-
-typedef struct PACKED _RT_VERSION_INFO {
- UCHAR DriverVersionW;
- UCHAR DriverVersionX;
- UCHAR DriverVersionY;
- UCHAR DriverVersionZ;
- UINT DriverBuildYear;
- UINT DriverBuildMonth;
- UINT DriverBuildDay;
-} RT_VERSION_INFO, *PRT_VERSION_INFO;
-
-static __s32 ralinkrate[] = { 2, 4, 11, 22, // CCK
- 12, 18, 24, 36, 48, 72, 96, 108, // OFDM
- 13, 26, 39, 52, 78, 104, 117, 130, 26, 52, 78, 104, 156, 208, 234, 260, // 20MHz, 800ns GI, MCS: 0 ~ 15
- 39, 78, 117, 156, 234, 312, 351, 390, // 20MHz, 800ns GI, MCS: 16 ~ 23
- 27, 54, 81, 108, 162, 216, 243, 270, 54, 108, 162, 216, 324, 432, 486, 540, // 40MHz, 800ns GI, MCS: 0 ~ 15
- 81, 162, 243, 324, 486, 648, 729, 810, // 40MHz, 800ns GI, MCS: 16 ~ 23
- 14, 29, 43, 57, 87, 115, 130, 144, 29, 59, 87, 115, 173, 230, 260, 288, // 20MHz, 400ns GI, MCS: 0 ~ 15
- 43, 87, 130, 173, 260, 317, 390, 433, // 20MHz, 400ns GI, MCS: 16 ~ 23
- 30, 60, 90, 120, 180, 240, 270, 300, 60, 120, 180, 240, 360, 480, 540, 600, // 40MHz, 400ns GI, MCS: 0 ~ 15
+extern u8 CipherWpa2Template[];
+
+struct PACKED rt_version_info {
+ u8 DriverVersionW;
+ u8 DriverVersionX;
+ u8 DriverVersionY;
+ u8 DriverVersionZ;
+ u32 DriverBuildYear;
+ u32 DriverBuildMonth;
+ u32 DriverBuildDay;
+};
+
+static __s32 ralinkrate[] = { 2, 4, 11, 22, /* CCK */
+ 12, 18, 24, 36, 48, 72, 96, 108, /* OFDM */
+ 13, 26, 39, 52, 78, 104, 117, 130, 26, 52, 78, 104, 156, 208, 234, 260, /* 20MHz, 800ns GI, MCS: 0 ~ 15 */
+ 39, 78, 117, 156, 234, 312, 351, 390, /* 20MHz, 800ns GI, MCS: 16 ~ 23 */
+ 27, 54, 81, 108, 162, 216, 243, 270, 54, 108, 162, 216, 324, 432, 486, 540, /* 40MHz, 800ns GI, MCS: 0 ~ 15 */
+ 81, 162, 243, 324, 486, 648, 729, 810, /* 40MHz, 800ns GI, MCS: 16 ~ 23 */
+ 14, 29, 43, 57, 87, 115, 130, 144, 29, 59, 87, 115, 173, 230, 260, 288, /* 20MHz, 400ns GI, MCS: 0 ~ 15 */
+ 43, 87, 130, 173, 260, 317, 390, 433, /* 20MHz, 400ns GI, MCS: 16 ~ 23 */
+ 30, 60, 90, 120, 180, 240, 270, 300, 60, 120, 180, 240, 360, 480, 540, 600, /* 40MHz, 400ns GI, MCS: 0 ~ 15 */
90, 180, 270, 360, 540, 720, 810, 900
};
-INT Set_SSID_Proc(IN PRTMP_ADAPTER pAdapter, IN PSTRING arg);
+int Set_SSID_Proc(struct rt_rtmp_adapter *pAdapter, char *arg);
-INT Set_NetworkType_Proc(IN PRTMP_ADAPTER pAdapter, IN PSTRING arg);
+int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg);
-VOID RTMPAddKey(IN PRTMP_ADAPTER pAd, IN PNDIS_802_11_KEY pKey)
+void RTMPAddKey(struct rt_rtmp_adapter *pAd, struct rt_ndis_802_11_key *pKey)
{
- ULONG KeyIdx;
- MAC_TABLE_ENTRY *pEntry;
+ unsigned long KeyIdx;
+ struct rt_mac_table_entry *pEntry;
DBGPRINT(RT_DEBUG_TRACE, ("RTMPAddKey ------>\n"));
pKey->KeyLength);
goto end;
}
- // Update PTK
+ /* Update PTK */
NdisZeroMemory(&pAd->SharedKey[BSS0][0],
- sizeof(CIPHER_KEY));
+ sizeof(struct rt_cipher_key));
pAd->SharedKey[BSS0][0].KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pAd->SharedKey[BSS0][0].Key,
pKey->KeyMaterial, LEN_TKIP_EK);
LEN_TKIP_RXMICK);
}
- // Decide its ChiperAlg
+ /* Decide its ChiperAlg */
if (pAd->StaCfg.PairCipher ==
Ndis802_11Encryption2Enabled)
pAd->SharedKey[BSS0][0].CipherAlg = CIPHER_TKIP;
else
pAd->SharedKey[BSS0][0].CipherAlg = CIPHER_NONE;
- // Update these related information to MAC_TABLE_ENTRY
+ /* Update these related information to struct rt_mac_table_entry */
pEntry = &pAd->MacTab.Content[BSSID_WCID];
NdisMoveMemory(pEntry->PairwiseKey.Key,
pAd->SharedKey[BSS0][0].Key,
pEntry->PairwiseKey.CipherAlg =
pAd->SharedKey[BSS0][0].CipherAlg;
- // Update pairwise key information to ASIC Shared Key Table
+ /* Update pairwise key information to ASIC Shared Key Table */
AsicAddSharedKeyEntry(pAd,
BSS0,
0,
pAd->SharedKey[BSS0][0].TxMic,
pAd->SharedKey[BSS0][0].RxMic);
- // Update ASIC WCID attribute table and IVEIV table
+ /* Update ASIC WCID attribute table and IVEIV table */
RTMPAddWcidAttributeEntry(pAd,
BSS0,
0,
CipherAlg, pEntry);
if (pAd->StaCfg.AuthMode >= Ndis802_11AuthModeWPA2) {
- // set 802.1x port control
- //pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /* set 802.1x port control */
+ /*pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAd);
- // Indicate Connected for GUI
+ /* Indicate Connected for GUI */
pAd->IndicateMediaState =
NdisMediaStateConnected;
}
} else {
- // Update GTK
+ /* Update GTK */
pAd->StaCfg.DefaultKeyId = (pKey->KeyIndex & 0xFF);
NdisZeroMemory(&pAd->
SharedKey[BSS0][pAd->StaCfg.
DefaultKeyId],
- sizeof(CIPHER_KEY));
+ sizeof(struct rt_cipher_key));
pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].KeyLen =
LEN_TKIP_EK;
NdisMoveMemory(pAd->
LEN_TKIP_RXMICK);
}
- // Update Shared Key CipherAlg
+ /* Update Shared Key CipherAlg */
pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].
CipherAlg = CIPHER_NONE;
if (pAd->StaCfg.GroupCipher ==
pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId].
CipherAlg = CIPHER_AES;
- // Update group key information to ASIC Shared Key Table
+ /* Update group key information to ASIC Shared Key Table */
AsicAddSharedKeyEntry(pAd,
BSS0,
pAd->StaCfg.DefaultKeyId,
DefaultKeyId].
RxMic);
- // Update ASIC WCID attribute table and IVEIV table
+ /* Update ASIC WCID attribute table and IVEIV table */
RTMPAddWcidAttributeEntry(pAd,
BSS0,
pAd->StaCfg.DefaultKeyId,
DefaultKeyId].
CipherAlg, NULL);
- // set 802.1x port control
- //pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /* set 802.1x port control */
+ /*pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAd);
- // Indicate Connected for GUI
+ /* Indicate Connected for GUI */
pAd->IndicateMediaState = NdisMediaStateConnected;
}
- } else // dynamic WEP from wpa_supplicant
+ } else /* dynamic WEP from wpa_supplicant */
{
- UCHAR CipherAlg;
- PUCHAR Key;
+ u8 CipherAlg;
+ u8 *Key;
if (pKey->KeyLength == 32)
goto end;
KeyIdx = pKey->KeyIndex & 0x0fffffff;
if (KeyIdx < 4) {
- // it is a default shared key, for Pairwise key setting
+ /* it is a default shared key, for Pairwise key setting */
if (pKey->KeyIndex & 0x80000000) {
pEntry = MacTableLookup(pAd, pKey->BSSID);
DBGPRINT(RT_DEBUG_TRACE,
("RTMPAddKey: Set Pair-wise Key\n"));
- // set key material and key length
+ /* set key material and key length */
pEntry->PairwiseKey.KeyLen =
- (UCHAR) pKey->KeyLength;
+ (u8)pKey->KeyLength;
NdisMoveMemory(pEntry->PairwiseKey.Key,
&pKey->KeyMaterial,
pKey->KeyLength);
- // set Cipher type
+ /* set Cipher type */
if (pKey->KeyLength == 5)
pEntry->PairwiseKey.CipherAlg =
CIPHER_WEP64;
pEntry->PairwiseKey.CipherAlg =
CIPHER_WEP128;
- // Add Pair-wise key to Asic
+ /* Add Pair-wise key to Asic */
AsicAddPairwiseKeyEntry(pAd,
pEntry->Addr,
- (UCHAR) pEntry->
+ (u8)pEntry->
Aid,
&pEntry->
PairwiseKey);
- // update WCID attribute table and IVEIV table for this entry
- RTMPAddWcidAttributeEntry(pAd, BSS0, KeyIdx, // The value may be not zero
+ /* update WCID attribute table and IVEIV table for this entry */
+ RTMPAddWcidAttributeEntry(pAd, BSS0, KeyIdx, /* The value may be not zero */
pEntry->
PairwiseKey.
CipherAlg,
}
} else {
- // Default key for tx (shared key)
- pAd->StaCfg.DefaultKeyId = (UCHAR) KeyIdx;
+ /* Default key for tx (shared key) */
+ pAd->StaCfg.DefaultKeyId = (u8)KeyIdx;
- // set key material and key length
+ /* set key material and key length */
pAd->SharedKey[BSS0][KeyIdx].KeyLen =
- (UCHAR) pKey->KeyLength;
+ (u8)pKey->KeyLength;
NdisMoveMemory(pAd->SharedKey[BSS0][KeyIdx].Key,
&pKey->KeyMaterial,
pKey->KeyLength);
- // Set Ciper type
+ /* Set Ciper type */
if (pKey->KeyLength == 5)
pAd->SharedKey[BSS0][KeyIdx].CipherAlg =
CIPHER_WEP64;
pAd->SharedKey[BSS0][KeyIdx].CipherAlg;
Key = pAd->SharedKey[BSS0][KeyIdx].Key;
- // Set Group key material to Asic
+ /* Set Group key material to Asic */
AsicAddSharedKeyEntry(pAd, BSS0, KeyIdx,
CipherAlg, Key, NULL,
NULL);
- // Update WCID attribute table and IVEIV table for this group key table
+ /* Update WCID attribute table and IVEIV table for this group key table */
RTMPAddWcidAttributeEntry(pAd, BSS0, KeyIdx,
CipherAlg, NULL);
struct iw_request_info *info, char *name, char *extra)
{
strncpy(name, "Ralink STA", IFNAMSIZ);
- // RT2870 2.1.0.0 uses "RT2870 Wireless"
- // RT3090 2.1.0.0 uses "RT2860 Wireless"
+ /* RT2870 2.1.0.0 uses "RT2870 Wireless" */
+ /* RT3090 2.1.0.0 uses "RT2860 Wireless" */
return 0;
}
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
int chan = -1;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
return -EINVAL;
if ((freq->e == 0) && (freq->m <= 1000))
- chan = freq->m; // Setting by channel number
+ chan = freq->m; /* Setting by channel number */
else
- MAP_KHZ_TO_CHANNEL_ID((freq->m / 100), chan); // Setting by frequency - search the table , like 2.412G, 2.422G,
+ MAP_KHZ_TO_CHANNEL_ID((freq->m / 100), chan); /* Setting by frequency - search the table , like 2.412G, 2.422G, */
if (ChannelSanity(pAdapter, chan) == TRUE) {
pAdapter->CommonCfg.Channel = chan;
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
- UCHAR ch;
- ULONG m = 2412000;
+ struct rt_rtmp_adapter *pAdapter = NULL;
+ u8 ch;
+ unsigned long m = 2412000;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
int rt_ioctl_siwmode(struct net_device *dev,
struct iw_request_info *info, __u32 * mode, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
return -EINVAL;
}
- // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key
+ /* Reset Ralink supplicant to not use, it will be set to start when UI set PMK key */
pAdapter->StaCfg.WpaState = SS_NOTUSE;
return 0;
int rt_ioctl_giwmode(struct net_device *dev,
struct iw_request_info *info, __u32 * mode, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
int rt_ioctl_siwsens(struct net_device *dev,
struct iw_request_info *info, char *name, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
struct iw_range *range = (struct iw_range *)extra;
u16 val;
int i;
struct iw_request_info *info,
struct sockaddr *ap_addr, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
NDIS_802_11_MAC_ADDRESS Bssid;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) {
RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
DBGPRINT(RT_DEBUG_TRACE,
- ("!!! MLME busy, reset MLME state machine !!!\n"));
+ ("MLME busy, reset MLME state machine!\n"));
}
- // tell CNTL state machine to call NdisMSetInformationComplete() after completing
- // this request, because this request is initiated by NDIS.
+ /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */
+ /* this request, because this request is initiated by NDIS. */
pAdapter->MlmeAux.CurrReqIsFromNdis = FALSE;
- // Prevent to connect AP again in STAMlmePeriodicExec
+ /* Prevent to connect AP again in STAMlmePeriodicExec */
pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
memset(Bssid, 0, MAC_ADDR_LEN);
MlmeEnqueue(pAdapter,
MLME_CNTL_STATE_MACHINE,
OID_802_11_BSSID,
- sizeof(NDIS_802_11_MAC_ADDRESS), (VOID *) & Bssid);
+ sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid);
DBGPRINT(RT_DEBUG_TRACE,
("IOCTL::SIOCSIWAP %02x:%02x:%02x:%02x:%02x:%02x\n", Bssid[0],
struct iw_request_info *info,
struct sockaddr *ap_addr, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
ap_addr->sa_family = ARPHRD_ETHER;
memcpy(ap_addr->sa_data, &pAdapter->CommonCfg.Bssid, ETH_ALEN);
}
- // Add for RT2870
+ /* Add for RT2870 */
else if (pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) {
ap_addr->sa_family = ARPHRD_ETHER;
memcpy(ap_addr->sa_data, &pAdapter->MlmeAux.Bssid, ETH_ALEN);
* NB: various calculations are based on the orinoco/wavelan
* drivers for compatibility
*/
-static void set_quality(PRTMP_ADAPTER pAdapter,
+static void set_quality(struct rt_rtmp_adapter *pAdapter,
struct iw_quality *iq, signed char rssi)
{
__u8 ChannelQuality;
- // Normalize Rssi
+ /* Normalize Rssi */
if (rssi >= -50)
ChannelQuality = 100;
- else if (rssi >= -80) // between -50 ~ -80dbm
+ else if (rssi >= -80) /* between -50 ~ -80dbm */
ChannelQuality = (__u8) (24 + ((rssi + 80) * 26) / 10);
- else if (rssi >= -90) // between -80 ~ -90dbm
+ else if (rssi >= -90) /* between -80 ~ -90dbm */
ChannelQuality = (__u8) ((rssi + 90) * 26) / 10;
else
ChannelQuality = 0;
iq->qual = (__u8) ChannelQuality;
iq->level = (__u8) (rssi);
- iq->noise = (pAdapter->BbpWriteLatch[66] > pAdapter->BbpTuning.FalseCcaUpperThreshold) ? ((__u8) pAdapter->BbpTuning.FalseCcaUpperThreshold) : ((__u8) pAdapter->BbpWriteLatch[66]); // noise level (dBm)
+ iq->noise = (pAdapter->BbpWriteLatch[66] > pAdapter->BbpTuning.FalseCcaUpperThreshold) ? ((__u8) pAdapter->BbpTuning.FalseCcaUpperThreshold) : ((__u8) pAdapter->BbpWriteLatch[66]); /* noise level (dBm) */
iq->noise += 256 - 143;
iq->updated = pAdapter->iw_stats.qual.updated;
}
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
struct sockaddr addr[IW_MAX_AP];
struct iw_quality qual[IW_MAX_AP];
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
data->length = 0;
return 0;
- //return -ENETDOWN;
+ /*return -ENETDOWN; */
}
for (i = 0; i < IW_MAX_AP; i++) {
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
- ULONG Now;
+ unsigned long Now;
int Status = NDIS_STATUS_SUCCESS;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
if (MONITOR_ON(pAdapter)) {
DBGPRINT(RT_DEBUG_TRACE,
- ("!!! Driver is in Monitor Mode now !!!\n"));
+ ("Driver is in Monitor Mode now!\n"));
return -EINVAL;
}
if ((pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE)
&& (pAdapter->StaCfg.WpaSupplicantScanCount > 3)) {
DBGPRINT(RT_DEBUG_TRACE,
- ("!!! WpaSupplicantScanCount > 3\n"));
+ ("WpaSupplicantScanCount > 3\n"));
Status = NDIS_STATUS_SUCCESS;
break;
}
&& (pAdapter->StaCfg.PortSecured ==
WPA_802_1X_PORT_NOT_SECURED)) {
DBGPRINT(RT_DEBUG_TRACE,
- ("!!! Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n"));
+ ("Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n"));
Status = NDIS_STATUS_SUCCESS;
break;
}
if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) {
RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
DBGPRINT(RT_DEBUG_TRACE,
- ("!!! MLME busy, reset MLME state machine !!!\n"));
+ ("MLME busy, reset MLME state machine!\n"));
}
- // tell CNTL state machine to call NdisMSetInformationComplete() after completing
- // this request, because this request is initiated by NDIS.
+ /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */
+ /* this request, because this request is initiated by NDIS. */
pAdapter->MlmeAux.CurrReqIsFromNdis = FALSE;
- // Reset allowed scan retries
+ /* Reset allowed scan retries */
pAdapter->StaCfg.ScanCnt = 0;
pAdapter->StaCfg.LastScanTime = Now;
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
int i = 0;
- PSTRING current_ev = extra, previous_ev = extra;
- PSTRING end_buf;
- PSTRING current_val;
- STRING custom[MAX_CUSTOM_LEN] = { 0 };
+ char *current_ev = extra, *previous_ev = extra;
+ char *end_buf;
+ char *current_val;
+ char custom[MAX_CUSTOM_LEN] = { 0 };
struct iw_event iwe;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
if (current_ev >= end_buf) {
return -E2BIG;
}
- //MAC address
- //================================
+ /*MAC address */
+ /*================================ */
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
iwe.cmd = SIOCGIWNAME;
{
- PBSS_ENTRY pBssEntry = &pAdapter->ScanTab.BssEntry[i];
+ struct rt_bss_entry *pBssEntry = &pAdapter->ScanTab.BssEntry[i];
BOOLEAN isGonly = FALSE;
int rateCnt = 0;
if (current_ev == previous_ev)
return -E2BIG;
- //ESSID
- //================================
+ /*ESSID */
+ /*================================ */
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWESSID;
iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].SsidLen;
previous_ev = current_ev;
current_ev =
iwe_stream_add_point(info, current_ev, end_buf, &iwe,
- (PSTRING) pAdapter->ScanTab.
+ (char *)pAdapter->ScanTab.
BssEntry[i].Ssid);
if (current_ev == previous_ev)
return -E2BIG;
- //Network Type
- //================================
+ /*Network Type */
+ /*================================ */
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWMODE;
if (pAdapter->ScanTab.BssEntry[i].BssType == Ndis802_11IBSS) {
if (current_ev == previous_ev)
return -E2BIG;
- //Channel and Frequency
- //================================
+ /*Channel and Frequency */
+ /*================================ */
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWFREQ;
- if (INFRA_ON(pAdapter) || ADHOC_ON(pAdapter))
- iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
- else
- iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
+ iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
iwe.u.freq.e = 0;
iwe.u.freq.i = 0;
if (current_ev == previous_ev)
return -E2BIG;
- //Add quality statistics
- //================================
+ /*Add quality statistics */
+ /*================================ */
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVQUAL;
iwe.u.qual.level = 0;
if (current_ev == previous_ev)
return -E2BIG;
- //Encyption key
- //================================
+ /*Encyption key */
+ /*================================ */
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWENCODE;
if (CAP_IS_PRIVACY_ON
if (current_ev == previous_ev)
return -E2BIG;
- //Bit Rate
- //================================
+ /*Bit Rate */
+ /*================================ */
if (pAdapter->ScanTab.BssEntry[i].SupRateLen) {
- UCHAR tmpRate =
+ u8 tmpRate =
pAdapter->ScanTab.BssEntry[i].SupRate[pAdapter->
ScanTab.
BssEntry[i].
0) {
int rate_count =
sizeof(ralinkrate) / sizeof(__s32);
- HT_CAP_INFO capInfo =
+ struct rt_ht_cap_info capInfo =
pAdapter->ScanTab.BssEntry[i].HtCapability.
HtCapInfo;
int shortGI =
pAdapter->ScanTab.BssEntry[i].HtCapability.
MCSSet[1] ? 15 : 7;
int rate_index =
- 12 + ((UCHAR) capInfo.ChannelWidth * 24) +
- ((UCHAR) shortGI * 48) + ((UCHAR) maxMCS);
+ 12 + ((u8)capInfo.ChannelWidth * 24) +
+ ((u8)shortGI * 48) + ((u8)maxMCS);
if (rate_index < 0)
rate_index = 0;
if (rate_index > rate_count)
else
return -E2BIG;
}
- //WPA IE
+ /*WPA IE */
if (pAdapter->ScanTab.BssEntry[i].WpaIE.IELen > 0) {
memset(&iwe, 0, sizeof(iwe));
memset(&custom[0], 0, MAX_CUSTOM_LEN);
if (current_ev == previous_ev)
return -E2BIG;
}
- //WPA2 IE
+ /*WPA2 IE */
if (pAdapter->ScanTab.BssEntry[i].RsnIE.IELen > 0) {
memset(&iwe, 0, sizeof(iwe));
memset(&custom[0], 0, MAX_CUSTOM_LEN);
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
}
if (data->flags) {
- PSTRING pSsidString = NULL;
+ char *pSsidString = NULL;
- // Includes null character.
+ /* Includes null character. */
if (data->length > (IW_ESSID_MAX_SIZE + 1))
return -E2BIG;
} else
return -ENOMEM;
} else {
- // ANY ssid
+ /* ANY ssid */
if (Set_SSID_Proc(pAdapter, "") == FALSE)
return -EINVAL;
}
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
pAdapter->CommonCfg.SsidLen);
}
#ifdef RTMP_MAC_USB
- // Add for RT2870
+ /* Add for RT2870 */
else if (pAdapter->StaCfg.WpaSupplicantUP != WPA_SUPPLICANT_DISABLE) {
data->length = pAdapter->CommonCfg.SsidLen;
memcpy(essid, pAdapter->CommonCfg.Ssid,
pAdapter->CommonCfg.SsidLen);
}
-#endif // RTMP_MAC_USB //
- else { //the ANY ssid was specified
+#endif /* RTMP_MAC_USB // */
+ else { /*the ANY ssid was specified */
data->length = 0;
DBGPRINT(RT_DEBUG_TRACE,
("MediaState is not connected, ess\n"));
struct iw_request_info *info,
struct iw_point *data, char *nickname)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
struct iw_request_info *info,
struct iw_point *data, char *nickname)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- if (data->length > strlen((PSTRING) pAdapter->nickname) + 1)
- data->length = strlen((PSTRING) pAdapter->nickname) + 1;
+ if (data->length > strlen((char *)pAdapter->nickname) + 1)
+ data->length = strlen((char *)pAdapter->nickname) + 1;
if (data->length > 0) {
memcpy(nickname, pAdapter->nickname, data->length - 1);
nickname[data->length - 1] = '\0';
struct iw_request_info *info,
struct iw_param *rts, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
u16 val;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
struct iw_request_info *info,
struct iw_param *rts, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
struct iw_request_info *info,
struct iw_param *frag, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
u16 val;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
struct iw_request_info *info,
struct iw_param *frag, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
goto done;
} else if (erq->flags & IW_ENCODE_RESTRICTED
|| erq->flags & IW_ENCODE_OPEN) {
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled;
pAdapter->StaCfg.GroupCipher = Ndis802_11WEPEnabled;
("==>rt_ioctl_siwencode::Wrong keyIdx=%d! Using default key instead (%d)\n",
keyIdx, pAdapter->StaCfg.DefaultKeyId));
- //Using default key
+ /*Using default key */
keyIdx = pAdapter->StaCfg.DefaultKeyId;
} else
pAdapter->StaCfg.DefaultKeyId = keyIdx;
struct iw_point *erq, char *key)
{
int kid;
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
erq->length = 0;
erq->flags = IW_ENCODE_DISABLED;
} else if ((kid > 0) && (kid <= 4)) {
- // copy wep key
+ /* copy wep key */
erq->flags = kid; /* NB: base 1 */
if (erq->length > pAdapter->SharedKey[BSS0][kid - 1].KeyLen)
erq->length = pAdapter->SharedKey[BSS0][kid - 1].KeyLen;
memcpy(key, pAdapter->SharedKey[BSS0][kid - 1].Key,
erq->length);
- //if ((kid == pAdapter->PortCfg.DefaultKeyId))
- //erq->flags |= IW_ENCODE_ENABLED; /* XXX */
+ /*if ((kid == pAdapter->PortCfg.DefaultKeyId)) */
+ /*erq->flags |= IW_ENCODE_ENABLED; */ /* XXX */
if (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeShared)
erq->flags |= IW_ENCODE_RESTRICTED; /* XXX */
else
memcpy(key,
pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].
Key, erq->length);
- // copy default key ID
+ /* copy default key ID */
if (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeShared)
erq->flags |= IW_ENCODE_RESTRICTED; /* XXX */
else
}
-void getBaInfo(IN PRTMP_ADAPTER pAd, IN PSTRING pOutBuf)
+void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf)
{
- INT i, j;
- BA_ORI_ENTRY *pOriBAEntry;
- BA_REC_ENTRY *pRecBAEntry;
+ int i, j;
+ struct rt_ba_ori_entry *pOriBAEntry;
+ struct rt_ba_rec_entry *pRecBAEntry;
for (i = 0; i < MAX_LEN_OF_MAC_TABLE; i++) {
- PMAC_TABLE_ENTRY pEntry = &pAd->MacTab.Content[i];
+ struct rt_mac_table_entry *pEntry = &pAd->MacTab.Content[i];
if (((pEntry->ValidAsCLI || pEntry->ValidAsApCli)
&& (pEntry->Sst == SST_ASSOC))
|| (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) {
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
+ struct rt_rtmp_adapter *pAd = NULL;
struct iw_mlme *pMlme = (struct iw_mlme *)wrqu->data.pointer;
- MLME_QUEUE_ELEM MsgElem;
- MLME_DISASSOC_REQ_STRUCT DisAssocReq;
- MLME_DEAUTH_REQ_STRUCT DeAuthReq;
+ struct rt_mlme_queue_elem MsgElem;
+ struct rt_mlme_disassoc_req DisAssocReq;
+ struct rt_mlme_deauth_req DeAuthReq;
GET_PAD_FROM_NET_DEV(pAd, dev);
("====> %s - IW_MLME_DEAUTH\n", __func__));
COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid);
DeAuthReq.Reason = pMlme->reason_code;
- MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT);
+ MsgElem.MsgLen = sizeof(struct rt_mlme_deauth_req);
NdisMoveMemory(MsgElem.Msg, &DeAuthReq,
- sizeof(MLME_DEAUTH_REQ_STRUCT));
+ sizeof(struct rt_mlme_deauth_req));
MlmeDeauthReqAction(pAd, &MsgElem);
if (INFRA_ON(pAd)) {
LinkDown(pAd, FALSE);
pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
}
break;
-#endif // IW_MLME_DEAUTH //
+#endif /* IW_MLME_DEAUTH // */
#ifdef IW_MLME_DISASSOC
case IW_MLME_DISASSOC:
DBGPRINT(RT_DEBUG_TRACE,
MsgElem.Machine = ASSOC_STATE_MACHINE;
MsgElem.MsgType = MT2_MLME_DISASSOC_REQ;
- MsgElem.MsgLen = sizeof(MLME_DISASSOC_REQ_STRUCT);
+ MsgElem.MsgLen = sizeof(struct rt_mlme_disassoc_req);
NdisMoveMemory(MsgElem.Msg, &DisAssocReq,
- sizeof(MLME_DISASSOC_REQ_STRUCT));
+ sizeof(struct rt_mlme_disassoc_req));
pAd->Mlme.CntlMachine.CurrState = CNTL_WAIT_OID_DISASSOC;
MlmeDisassocReqAction(pAd, &MsgElem);
break;
-#endif // IW_MLME_DISASSOC //
+#endif /* IW_MLME_DISASSOC // */
default:
DBGPRINT(RT_DEBUG_TRACE,
("====> %s - Unknow Command\n", __func__));
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
struct iw_param *param = &wrqu->param;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
Ndis802_11AuthModeWPA2;
pAdapter->StaCfg.IEEE8021X = FALSE;
} else
- // WEP 1x
+ /* WEP 1x */
pAdapter->StaCfg.IEEE8021X = TRUE;
} else if (param->value == 0) {
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
}
DBGPRINT(RT_DEBUG_TRACE,
pAdapter->StaCfg.PortSecured =
WPA_802_1X_PORT_NOT_SECURED;
else {
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
}
DBGPRINT(RT_DEBUG_TRACE,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
struct iw_param *param = &wrqu->param;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
return 0;
}
-void fnSetCipherKey(IN PRTMP_ADAPTER pAdapter,
- IN INT keyIdx,
- IN UCHAR CipherAlg,
+void fnSetCipherKey(struct rt_rtmp_adapter *pAdapter,
+ int keyIdx,
+ u8 CipherAlg,
IN BOOLEAN bGTK, IN struct iw_encode_ext *ext)
{
- NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY));
+ NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(struct rt_cipher_key));
pAdapter->SharedKey[BSS0][keyIdx].KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key,
LEN_TKIP_EK);
LEN_TKIP_RXMICK);
pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CipherAlg;
- // Update group key information to ASIC Shared Key Table
+ /* Update group key information to ASIC Shared Key Table */
AsicAddSharedKeyEntry(pAdapter,
BSS0,
keyIdx,
pAdapter->SharedKey[BSS0][keyIdx].RxMic);
if (bGTK)
- // Update ASIC WCID attribute table and IVEIV table
+ /* Update ASIC WCID attribute table and IVEIV table */
RTMPAddWcidAttributeEntry(pAdapter,
BSS0,
keyIdx,
pAdapter->SharedKey[BSS0][keyIdx].
CipherAlg, NULL);
else
- // Update ASIC WCID attribute table and IVEIV table
+ /* Update ASIC WCID attribute table and IVEIV table */
RTMPAddWcidAttributeEntry(pAdapter,
BSS0,
keyIdx,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAdapter = NULL;
+ struct rt_rtmp_adapter *pAdapter = NULL;
struct iw_point *encoding = &wrqu->encoding;
struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
int keyIdx, alg = ext->alg;
GET_PAD_FROM_NET_DEV(pAdapter, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
if (encoding->flags & IW_ENCODE_DISABLED) {
keyIdx = (encoding->flags & IW_ENCODE_INDEX) - 1;
- // set BSSID wcid entry of the Pair-wise Key table as no-security mode
+ /* set BSSID wcid entry of the Pair-wise Key table as no-security mode */
AsicRemovePairwiseKeyEntry(pAdapter, BSS0, BSSID_WCID);
pAdapter->SharedKey[BSS0][keyIdx].KeyLen = 0;
pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE;
- AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR) keyIdx);
+ AsicRemoveSharedKeyEntry(pAdapter, 0, (u8)keyIdx);
NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx],
- sizeof(CIPHER_KEY));
+ sizeof(struct rt_cipher_key));
DBGPRINT(RT_DEBUG_TRACE,
("%s::Remove all keys!(encoding->flags = %x)\n",
__func__, encoding->flags));
} else {
- // Get Key Index and convet to our own defined key index
+ /* Get Key Index and convet to our own defined key index */
keyIdx = (encoding->flags & IW_ENCODE_INDEX) - 1;
if ((keyIdx < 0) || (keyIdx >= NR_WEP_KEYS))
return -EINVAL;
Ndis802_11GroupWEP40Enabled
|| pAdapter->StaCfg.GroupCipher ==
Ndis802_11GroupWEP104Enabled) {
- // Set Group key material to Asic
+ /* Set Group key material to Asic */
AsicAddSharedKeyEntry(pAdapter, BSS0, keyIdx,
pAdapter->
SharedKey[BSS0][keyIdx].
SharedKey[BSS0][keyIdx].
Key, NULL, NULL);
- // Update WCID attribute table and IVEIV table for this group key table
+ /* Update WCID attribute table and IVEIV table for this group key table */
RTMPAddWcidAttributeEntry(pAdapter, BSS0,
keyIdx,
pAdapter->
STA_PORT_SECURED(pAdapter);
- // Indicate Connected for GUI
+ /* Indicate Connected for GUI */
pAdapter->IndicateMediaState =
NdisMediaStateConnected;
}
CIPHER_TKIP, FALSE, ext);
if (pAdapter->StaCfg.AuthMode >=
Ndis802_11AuthModeWPA2) {
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
pAdapter->IndicateMediaState =
NdisMediaStateConnected;
fnSetCipherKey(pAdapter, keyIdx,
CIPHER_TKIP, TRUE, ext);
- // set 802.1x port control
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /* set 802.1x port control */
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
pAdapter->IndicateMediaState =
NdisMediaStateConnected;
FALSE, ext);
if (pAdapter->StaCfg.AuthMode >=
Ndis802_11AuthModeWPA2)
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
pAdapter->IndicateMediaState =
NdisMediaStateConnected;
fnSetCipherKey(pAdapter, keyIdx, CIPHER_AES,
TRUE, ext);
- // set 802.1x port control
- //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
+ /* set 802.1x port control */
+ /*pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; */
STA_PORT_SECURED(pAdapter);
pAdapter->IndicateMediaState =
NdisMediaStateConnected;
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
- PCHAR pKey = NULL;
+ struct rt_rtmp_adapter *pAd = NULL;
+ char *pKey = NULL;
struct iw_point *encoding = &wrqu->encoding;
struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
int idx, max_key_len;
return -E2BIG;
else {
ext->key_len = pAd->SharedKey[BSS0][idx].KeyLen;
- pKey = (PCHAR) & (pAd->SharedKey[BSS0][idx].Key[0]);
+ pKey = (char *)& (pAd->SharedKey[BSS0][idx].Key[0]);
}
break;
case Ndis802_11Encryption2Enabled:
return -E2BIG;
else {
ext->key_len = 32;
- pKey = (PCHAR) & pAd->StaCfg.PMK[0];
+ pKey = (char *)& pAd->StaCfg.PMK[0];
}
break;
default:
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
+ struct rt_rtmp_adapter *pAd = NULL;
GET_PAD_FROM_NET_DEV(pAd, dev);
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
+ struct rt_rtmp_adapter *pAd = NULL;
GET_PAD_FROM_NET_DEV(pAd, dev);
wrqu->data.length = pAd->StaCfg.RSNIE_Len;
memcpy(extra, &pAd->StaCfg.RSN_IE[0], pAd->StaCfg.RSNIE_Len);
} else {
- UCHAR RSNIe = IE_WPA;
+ u8 RSNIe = IE_WPA;
- if (wrqu->data.length < (pAd->StaCfg.RSNIE_Len + 2)) // ID, Len
+ if (wrqu->data.length < (pAd->StaCfg.RSNIE_Len + 2)) /* ID, Len */
return -E2BIG;
wrqu->data.length = pAd->StaCfg.RSNIE_Len + 2;
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
+ struct rt_rtmp_adapter *pAd = NULL;
struct iw_pmksa *pPmksa = (struct iw_pmksa *)wrqu->data.pointer;
- INT CachedIdx = 0, idx = 0;
+ int CachedIdx = 0, idx = 0;
GET_PAD_FROM_NET_DEV(pAd, dev);
switch (pPmksa->cmd) {
case IW_PMKSA_FLUSH:
NdisZeroMemory(pAd->StaCfg.SavedPMK,
- sizeof(BSSID_INFO) * PMKID_NO);
+ sizeof(struct rt_bssid_info) * PMKID_NO);
DBGPRINT(RT_DEBUG_TRACE,
("rt_ioctl_siwpmksa - IW_PMKSA_FLUSH\n"));
break;
case IW_PMKSA_REMOVE:
for (CachedIdx = 0; CachedIdx < pAd->StaCfg.SavedPMKNum;
CachedIdx++) {
- // compare the BSSID
+ /* compare the BSSID */
if (NdisEqualMemory
(pPmksa->bssid.sa_data,
pAd->StaCfg.SavedPMK[CachedIdx].BSSID,
case IW_PMKSA_ADD:
for (CachedIdx = 0; CachedIdx < pAd->StaCfg.SavedPMKNum;
CachedIdx++) {
- // compare the BSSID
+ /* compare the BSSID */
if (NdisEqualMemory
(pPmksa->bssid.sa_data,
pAd->StaCfg.SavedPMK[CachedIdx].BSSID,
break;
}
- // Found, replace it
+ /* Found, replace it */
if (CachedIdx < PMKID_NO) {
DBGPRINT(RT_DEBUG_OFF,
("Update PMKID, idx = %d\n", CachedIdx));
PMKID[0], pPmksa->pmkid, 16);
pAd->StaCfg.SavedPMKNum++;
}
- // Not found, replace the last one
+ /* Not found, replace the last one */
else {
- // Randomly replace one
+ /* Randomly replace one */
CachedIdx = (pPmksa->bssid.sa_data[5] % PMKID_NO);
DBGPRINT(RT_DEBUG_OFF,
("Update PMKID, idx = %d\n", CachedIdx));
break;
default:
DBGPRINT(RT_DEBUG_TRACE,
- ("rt_ioctl_siwpmksa - Unknow Command!!\n"));
+ ("rt_ioctl_siwpmksa - Unknown Command!\n"));
break;
}
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
- UINT32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed;
+ struct rt_rtmp_adapter *pAd = NULL;
+ u32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed;
GET_PAD_FROM_NET_DEV(pAd, dev);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE,
("rt_ioctl_siwrate::Network is down!\n"));
rate = X, fixed = 1 => (fixed rate X)
*/
if (rate == -1) {
- //Auto Rate
+ /*Auto Rate */
pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;
pAd->StaCfg.bAutoTxRateSwitch = TRUE;
if ((pAd->CommonCfg.PhyMode <= PHY_11G) ||
pAd->StaCfg.DesiredTransmitSetting.field.
MCS));
} else {
- // TODO: rate = X, fixed = 0 => (rates <= X)
+ /* TODO: rate = X, fixed = 0 => (rates <= X) */
return -EOPNOTSUPP;
}
}
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = NULL;
+ struct rt_rtmp_adapter *pAd = NULL;
int rate_index = 0, rate_count = 0;
HTTRANSMIT_SETTING ht_setting;
/* Remove to global variable
GET_PAD_FROM_NET_DEV(pAd, dev);
rate_count = sizeof(ralinkrate) / sizeof(__s32);
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
return -ENETDOWN;
pAd->MacTab.Content[BSSID_WCID].HTPhyMode.word;
if (ht_setting.field.MODE >= MODE_HTMIX) {
-// rate_index = 12 + ((UCHAR)ht_setting.field.BW *16) + ((UCHAR)ht_setting.field.ShortGI *32) + ((UCHAR)ht_setting.field.MCS);
+/* rate_index = 12 + ((u8)ht_setting.field.BW *16) + ((u8)ht_setting.field.ShortGI *32) + ((u8)ht_setting.field.MCS); */
rate_index =
- 12 + ((UCHAR) ht_setting.field.BW * 24) +
- ((UCHAR) ht_setting.field.ShortGI * 48) +
- ((UCHAR) ht_setting.field.MCS);
+ 12 + ((u8)ht_setting.field.BW * 24) +
+ ((u8)ht_setting.field.ShortGI * 48) +
+ ((u8)ht_setting.field.MCS);
} else if (ht_setting.field.MODE == MODE_OFDM)
- rate_index = (UCHAR) (ht_setting.field.MCS) + 4;
+ rate_index = (u8)(ht_setting.field.MCS) + 4;
else if (ht_setting.field.MODE == MODE_CCK)
- rate_index = (UCHAR) (ht_setting.field.MCS);
+ rate_index = (u8)(ht_setting.field.MCS);
if (rate_index < 0)
rate_index = 0;
#endif
};
-INT rt28xx_sta_ioctl(IN struct net_device *net_dev,
- IN OUT struct ifreq *rq, IN INT cmd)
+int rt28xx_sta_ioctl(IN struct net_device *net_dev,
+ IN OUT struct ifreq *rq, int cmd)
{
- POS_COOKIE pObj;
- RTMP_ADAPTER *pAd = NULL;
+ struct os_cookie *pObj;
+ struct rt_rtmp_adapter *pAd = NULL;
struct iwreq *wrq = (struct iwreq *)rq;
BOOLEAN StateMachineTouched = FALSE;
- INT Status = NDIS_STATUS_SUCCESS;
+ int Status = NDIS_STATUS_SUCCESS;
GET_PAD_FROM_NET_DEV(pAd, net_dev);
- pObj = (POS_COOKIE) pAd->OS_Cookie;
+ pObj = (struct os_cookie *)pAd->OS_Cookie;
- //check if the interface is down
+ /*check if the interface is down */
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) {
{
DBGPRINT(RT_DEBUG_TRACE, ("INFO::Network is down!\n"));
}
}
- { // determine this ioctl command is comming from which interface.
+ { /* determine this ioctl command is comming from which interface. */
pObj->ioctl_if_type = INT_MAIN;
pObj->ioctl_if = MAIN_MBSSID;
}
rt_ioctl_giwname(net_dev, NULL, name, NULL);
break;
}
- case SIOCGIWESSID: //Get ESSID
+ case SIOCGIWESSID: /*Get ESSID */
{
struct iw_point *essid = &wrq->u.essid;
rt_ioctl_giwessid(net_dev, NULL, essid, essid->pointer);
break;
}
- case SIOCSIWESSID: //Set ESSID
+ case SIOCSIWESSID: /*Set ESSID */
{
struct iw_point *essid = &wrq->u.essid;
rt_ioctl_siwessid(net_dev, NULL, essid, essid->pointer);
break;
}
- case SIOCSIWNWID: // set network id (the cell)
- case SIOCGIWNWID: // get network id
+ case SIOCSIWNWID: /* set network id (the cell) */
+ case SIOCGIWNWID: /* get network id */
Status = -EOPNOTSUPP;
break;
- case SIOCSIWFREQ: //set channel/frequency (Hz)
+ case SIOCSIWFREQ: /*set channel/frequency (Hz) */
{
struct iw_freq *freq = &wrq->u.freq;
rt_ioctl_siwfreq(net_dev, NULL, freq, NULL);
break;
}
- case SIOCGIWFREQ: // get channel/frequency (Hz)
+ case SIOCGIWFREQ: /* get channel/frequency (Hz) */
{
struct iw_freq *freq = &wrq->u.freq;
rt_ioctl_giwfreq(net_dev, NULL, freq, NULL);
break;
}
- case SIOCSIWNICKN: //set node name/nickname
+ case SIOCSIWNICKN: /*set node name/nickname */
{
- //struct iw_point *data=&wrq->u.data;
- //rt_ioctl_siwnickn(net_dev, NULL, data, NULL);
+ /*struct iw_point *data=&wrq->u.data; */
+ /*rt_ioctl_siwnickn(net_dev, NULL, data, NULL); */
break;
}
- case SIOCGIWNICKN: //get node name/nickname
+ case SIOCGIWNICKN: /*get node name/nickname */
{
struct iw_point *erq = NULL;
erq = &wrq->u.data;
- erq->length = strlen((PSTRING) pAd->nickname);
+ erq->length = strlen((char *)pAd->nickname);
Status =
copy_to_user(erq->pointer, pAd->nickname,
erq->length);
break;
}
- case SIOCGIWRATE: //get default bit rate (bps)
+ case SIOCGIWRATE: /*get default bit rate (bps) */
rt_ioctl_giwrate(net_dev, NULL, &wrq->u, NULL);
break;
- case SIOCSIWRATE: //set default bit rate (bps)
+ case SIOCSIWRATE: /*set default bit rate (bps) */
rt_ioctl_siwrate(net_dev, NULL, &wrq->u, NULL);
break;
- case SIOCGIWRTS: // get RTS/CTS threshold (bytes)
+ case SIOCGIWRTS: /* get RTS/CTS threshold (bytes) */
{
struct iw_param *rts = &wrq->u.rts;
rt_ioctl_giwrts(net_dev, NULL, rts, NULL);
break;
}
- case SIOCSIWRTS: //set RTS/CTS threshold (bytes)
+ case SIOCSIWRTS: /*set RTS/CTS threshold (bytes) */
{
struct iw_param *rts = &wrq->u.rts;
rt_ioctl_siwrts(net_dev, NULL, rts, NULL);
break;
}
- case SIOCGIWFRAG: //get fragmentation thr (bytes)
+ case SIOCGIWFRAG: /*get fragmentation thr (bytes) */
{
struct iw_param *frag = &wrq->u.frag;
rt_ioctl_giwfrag(net_dev, NULL, frag, NULL);
break;
}
- case SIOCSIWFRAG: //set fragmentation thr (bytes)
+ case SIOCSIWFRAG: /*set fragmentation thr (bytes) */
{
struct iw_param *frag = &wrq->u.frag;
rt_ioctl_siwfrag(net_dev, NULL, frag, NULL);
break;
}
- case SIOCGIWENCODE: //get encoding token & mode
+ case SIOCGIWENCODE: /*get encoding token & mode */
{
struct iw_point *erq = &wrq->u.encoding;
if (erq)
erq->pointer);
break;
}
- case SIOCSIWENCODE: //set encoding token & mode
+ case SIOCSIWENCODE: /*set encoding token & mode */
{
struct iw_point *erq = &wrq->u.encoding;
if (erq)
erq->pointer);
break;
}
- case SIOCGIWAP: //get access point MAC addresses
+ case SIOCGIWAP: /*get access point MAC addresses */
{
struct sockaddr *ap_addr = &wrq->u.ap_addr;
rt_ioctl_giwap(net_dev, NULL, ap_addr,
ap_addr->sa_data);
break;
}
- case SIOCSIWAP: //set access point MAC addresses
+ case SIOCSIWAP: /*set access point MAC addresses */
{
struct sockaddr *ap_addr = &wrq->u.ap_addr;
rt_ioctl_siwap(net_dev, NULL, ap_addr,
ap_addr->sa_data);
break;
}
- case SIOCGIWMODE: //get operation mode
+ case SIOCGIWMODE: /*get operation mode */
{
__u32 *mode = &wrq->u.mode;
rt_ioctl_giwmode(net_dev, NULL, mode, NULL);
break;
}
- case SIOCSIWMODE: //set operation mode
+ case SIOCSIWMODE: /*set operation mode */
{
__u32 *mode = &wrq->u.mode;
rt_ioctl_siwmode(net_dev, NULL, mode, NULL);
break;
}
- case SIOCGIWSENS: //get sensitivity (dBm)
- case SIOCSIWSENS: //set sensitivity (dBm)
- case SIOCGIWPOWER: //get Power Management settings
- case SIOCSIWPOWER: //set Power Management settings
- case SIOCGIWTXPOW: //get transmit power (dBm)
- case SIOCSIWTXPOW: //set transmit power (dBm)
- case SIOCGIWRANGE: //Get range of parameters
- case SIOCGIWRETRY: //get retry limits and lifetime
- case SIOCSIWRETRY: //set retry limits and lifetime
+ case SIOCGIWSENS: /*get sensitivity (dBm) */
+ case SIOCSIWSENS: /*set sensitivity (dBm) */
+ case SIOCGIWPOWER: /*get Power Management settings */
+ case SIOCSIWPOWER: /*set Power Management settings */
+ case SIOCGIWTXPOW: /*get transmit power (dBm) */
+ case SIOCSIWTXPOW: /*set transmit power (dBm) */
+ case SIOCGIWRANGE: /*Get range of parameters */
+ case SIOCGIWRETRY: /*get retry limits and lifetime */
+ case SIOCSIWRETRY: /*set retry limits and lifetime */
case RT_PRIV_IOCTL:
case RT_PRIV_IOCTL_EXT:
case RTPRIV_IOCTL_SET:
break;
}
- if (StateMachineTouched) // Upper layer sent a MLME-related operations
+ if (StateMachineTouched) /* Upper layer sent a MLME-related operations */
RTMP_MLME_HANDLER(pAd);
return Status;
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
-INT Set_SSID_Proc(IN PRTMP_ADAPTER pAdapter, IN PSTRING arg)
+int Set_SSID_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
{
- NDIS_802_11_SSID Ssid, *pSsid = NULL;
+ struct rt_ndis_802_11_ssid Ssid, *pSsid = NULL;
BOOLEAN StateMachineTouched = FALSE;
int success = TRUE;
if (strlen(arg) <= MAX_LEN_OF_SSID) {
- NdisZeroMemory(&Ssid, sizeof(NDIS_802_11_SSID));
+ NdisZeroMemory(&Ssid, sizeof(struct rt_ndis_802_11_ssid));
if (strlen(arg) != 0) {
NdisMoveMemory(Ssid.Ssid, arg, strlen(arg));
Ssid.SsidLength = strlen(arg);
- } else //ANY ssid
+ } else /*ANY ssid */
{
Ssid.SsidLength = 0;
memcpy(Ssid.Ssid, "", 0);
if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) {
RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
DBGPRINT(RT_DEBUG_TRACE,
- ("!!! MLME busy, reset MLME state machine !!!\n"));
+ ("MLME busy, reset MLME state machine!\n"));
}
if ((pAdapter->StaCfg.WpaPassPhraseLen >= 8) &&
(pAdapter->StaCfg.WpaPassPhraseLen <= 64)) {
- STRING passphrase_str[65] = { 0 };
- UCHAR keyMaterial[40];
+ char passphrase_str[65] = { 0 };
+ u8 keyMaterial[40];
RTMPMoveMemory(passphrase_str,
pAdapter->StaCfg.WpaPassPhrase,
pAdapter->StaCfg.WpaPassPhraseLen);
RTMPZeroMemory(pAdapter->StaCfg.PMK, 32);
if (pAdapter->StaCfg.WpaPassPhraseLen == 64) {
- AtoH((PSTRING) pAdapter->StaCfg.WpaPassPhrase,
+ AtoH((char *)pAdapter->StaCfg.WpaPassPhrase,
pAdapter->StaCfg.PMK, 32);
} else {
- PasswordHash((PSTRING) pAdapter->StaCfg.
+ PasswordHash((char *)pAdapter->StaCfg.
WpaPassPhrase, Ssid.Ssid,
Ssid.SsidLength, keyMaterial);
NdisMoveMemory(pAdapter->StaCfg.PMK,
MlmeEnqueue(pAdapter,
MLME_CNTL_STATE_MACHINE,
OID_802_11_SSID,
- sizeof(NDIS_802_11_SSID), (VOID *) pSsid);
+ sizeof(struct rt_ndis_802_11_ssid), (void *) pSsid);
StateMachineTouched = TRUE;
DBGPRINT(RT_DEBUG_TRACE,
} else
success = FALSE;
- if (StateMachineTouched) // Upper layer sent a MLME-related operations
+ if (StateMachineTouched) /* Upper layer sent a MLME-related operations */
RTMP_MLME_HANDLER(pAdapter);
return success;
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
-INT Set_NetworkType_Proc(IN PRTMP_ADAPTER pAdapter, IN PSTRING arg)
+int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
{
- UINT32 Value = 0;
+ u32 Value = 0;
if (strcmp(arg, "Adhoc") == 0) {
if (pAdapter->StaCfg.BssType != BSS_ADHOC) {
- // Config has changed
+ /* Config has changed */
pAdapter->bConfigChanged = TRUE;
if (MONITOR_ON(pAdapter)) {
RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG,
LinkDown(pAdapter, FALSE);
}
if (INFRA_ON(pAdapter)) {
- //BOOLEAN Cancelled;
- // Set the AutoReconnectSsid to prevent it reconnect to old SSID
- // Since calling this indicate user don't want to connect to that SSID anymore.
+ /*BOOLEAN Cancelled; */
+ /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */
+ /* Since calling this indicate user don't want to connect to that SSID anymore. */
pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
NdisZeroMemory(pAdapter->MlmeAux.
AutoReconnectSsid,
("===>Set_NetworkType_Proc::(AD-HOC)\n"));
} else if (strcmp(arg, "Infra") == 0) {
if (pAdapter->StaCfg.BssType != BSS_INFRA) {
- // Config has changed
+ /* Config has changed */
pAdapter->bConfigChanged = TRUE;
if (MONITOR_ON(pAdapter)) {
RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG,
LinkDown(pAdapter, FALSE);
}
if (ADHOC_ON(pAdapter)) {
- // Set the AutoReconnectSsid to prevent it reconnect to old SSID
- // Since calling this indicate user don't want to connect to that SSID anymore.
+ /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */
+ /* Since calling this indicate user don't want to connect to that SSID anymore. */
pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
NdisZeroMemory(pAdapter->MlmeAux.
AutoReconnectSsid,
DBGPRINT(RT_DEBUG_TRACE,
("===>Set_NetworkType_Proc::(INFRA)\n"));
} else if (strcmp(arg, "Monitor") == 0) {
- UCHAR bbpValue = 0;
+ u8 bbpValue = 0;
BCN_TIME_CFG_STRUC csr;
OPSTATUS_CLEAR_FLAG(pAdapter, fOP_STATUS_INFRA_ON);
OPSTATUS_CLEAR_FLAG(pAdapter, fOP_STATUS_ADHOC_ON);
OPSTATUS_SET_FLAG(pAdapter, fOP_STATUS_MEDIA_STATE_CONNECTED);
- // disable all periodic state machine
+ /* disable all periodic state machine */
pAdapter->StaCfg.bAutoReconnect = FALSE;
- // reset all mlme state machine
+ /* reset all mlme state machine */
RTMP_MLME_RESET_STATE_MACHINE(pAdapter);
DBGPRINT(RT_DEBUG_TRACE,
("fOP_STATUS_MEDIA_STATE_CONNECTED \n"));
pAdapter->CommonCfg.RegTransmitSetting.field.BW == BW_40 &&
pAdapter->CommonCfg.RegTransmitSetting.field.EXTCHA ==
EXTCHA_ABOVE) {
- // 40MHz ,control channel at lower
+ /* 40MHz ,control channel at lower */
RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, BBP_R4,
&bbpValue);
bbpValue &= (~0x18);
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAdapter, BBP_R4,
bbpValue);
pAdapter->CommonCfg.BBPCurrentBW = BW_40;
- // RX : control channel at lower
+ /* RX : control channel at lower */
RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, BBP_R3,
&bbpValue);
bbpValue &= (~0x20);
BW_40
&& pAdapter->CommonCfg.RegTransmitSetting.field.
EXTCHA == EXTCHA_BELOW) {
- // 40MHz ,control channel at upper
+ /* 40MHz ,control channel at upper */
RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, BBP_R4,
&bbpValue);
bbpValue &= (~0x18);
pAdapter->CommonCfg.Channel,
pAdapter->CommonCfg.CentralChannel));
} else {
- // 20MHz
+ /* 20MHz */
RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, BBP_R4,
&bbpValue);
bbpValue &= (~0x18);
("BW_20, Channel(%d)\n",
pAdapter->CommonCfg.Channel));
}
- // Enable Rx with promiscuous reception
+ /* Enable Rx with promiscuous reception */
RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG, 0x3);
- // ASIC supporsts sniffer function with replacing RSSI with timestamp.
- //RTMP_IO_READ32(pAdapter, MAC_SYS_CTRL, &Value);
- //Value |= (0x80);
- //RTMP_IO_WRITE32(pAdapter, MAC_SYS_CTRL, Value);
- // disable sync
+ /* ASIC supporsts sniffer function with replacing RSSI with timestamp. */
+ /*RTMP_IO_READ32(pAdapter, MAC_SYS_CTRL, &Value); */
+ /*Value |= (0x80); */
+ /*RTMP_IO_WRITE32(pAdapter, MAC_SYS_CTRL, Value); */
+ /* disable sync */
RTMP_IO_READ32(pAdapter, BCN_TIME_CFG, &csr.word);
csr.field.bBeaconGen = 0;
csr.field.bTBTTEnable = 0;
RTMP_IO_WRITE32(pAdapter, BCN_TIME_CFG, csr.word);
pAdapter->StaCfg.BssType = BSS_MONITOR;
- pAdapter->net_dev->type = ARPHRD_IEEE80211_PRISM; //ARPHRD_IEEE80211; // IEEE80211
+ pAdapter->net_dev->type = ARPHRD_IEEE80211_PRISM; /*ARPHRD_IEEE80211; // IEEE80211 */
DBGPRINT(RT_DEBUG_TRACE,
("===>Set_NetworkType_Proc::(MONITOR)\n"));
}
- // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key
+ /* Reset Ralink supplicant to not use, it will be set to start when UI set PMK key */
pAdapter->StaCfg.WpaState = SS_NOTUSE;
DBGPRINT(RT_DEBUG_TRACE,
git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff