Staging: rt28x0 cleanups
cover Staging: rt28x0 cleanups
Cleanups for rt28x0 drivers (almost 8 KLOC gone) removing private driver parameters, ioctls, WEXT handlers and unused features..
Tested with RT2860 and RT3070 (both still work for me :).
diffstat:
drivers/staging/rt2860/Makefile | 2 drivers/staging/rt2860/chip/rtmp_phy.h | 36 drivers/staging/rt2860/chips/rt30xx.c | 2 drivers/staging/rt2860/common/cmm_asic.c | 6 drivers/staging/rt2860/common/cmm_info.c | 4039 +++++----------------------- drivers/staging/rt2860/common/cmm_mac_pci.c | 7 drivers/staging/rt2860/common/cmm_profile.c | 1779 ------------ drivers/staging/rt2860/common/crypt_hmac.c | 85 drivers/staging/rt2860/common/crypt_sha2.c | 257 - drivers/staging/rt2860/common/ee_efuse.c | 1145 ------- drivers/staging/rt2860/common/ee_prom.c | 48 drivers/staging/rt2860/common/eeprom.c | 6 drivers/staging/rt2860/common/mlme.c | 1 drivers/staging/rt2860/common/rtmp_init.c | 21 drivers/staging/rt2860/common/rtmp_mcu.c | 2 drivers/staging/rt2860/crypt_hmac.h | 11 drivers/staging/rt2860/crypt_sha2.h | 28 drivers/staging/rt2860/eeprom.h | 15 drivers/staging/rt2860/oid.h | 19 drivers/staging/rt2860/pci_main_dev.c | 35 drivers/staging/rt2860/rt_config.h | 8 drivers/staging/rt2860/rt_linux.c | 30 drivers/staging/rt2860/rt_linux.h | 10 drivers/staging/rt2860/rt_main_dev.c | 6 drivers/staging/rt2860/rt_profile.c | 95 drivers/staging/rt2860/rtmp.h | 300 -- drivers/staging/rt2860/rtmp_chip.h | 4 drivers/staging/rt2860/rtmp_def.h | 9 drivers/staging/rt2860/sta/connect.c | 1 drivers/staging/rt2860/sta_ioctl.c | 1315 --------- drivers/staging/rt2860/usb_main_dev.c | 7 drivers/staging/rt2870/Makefile | 2 drivers/staging/rt2870/common/rtusb_io.c | 11 33 files changed, 819 insertions(+), 8523 deletions(-)
PATCH 1/12 Staging: rt28x0: remove unused ->eewrite methods
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove unused ->eewrite methods
--- drivers/staging/rt2860/common/ee_efuse.c | 17 ---------- drivers/staging/rt2860/common/ee_prom.c | 48 ------------------------------- drivers/staging/rt2860/common/eeprom.c | 3 - drivers/staging/rt2860/eeprom.h | 15 --------- drivers/staging/rt2860/rtmp.h | 1 drivers/staging/rt2860/rtmp_chip.h | 4 -- drivers/staging/rt2870/common/rtusb_io.c | 11 ------- 7 files changed, 99 deletions(-)
drivers/staging/rt2860/common/ee_efuse.c +0 -17
@@ -1271,23 +1271,6 @@ int rtmp_ee_efuse_read16(return (*pValue); } - -int rtmp_ee_efuse_write16 ( - IN RTMP_ADAPTER *pAd, - IN USHORT Offset, - IN USHORT data) -{ -if (pAd->bFroceEEPROMBuffer||pAd->bEEPROMFile) - { -DBGPRINT (RT_DEBUG_TRACE , ("Write to EEPROM Buffer\n" )); -NdisMoveMemory (&(pAd->EEPROMImage[Offset]), &data,2 ); - } -else -eFuseWriteRegisters (pAd, Offset,2 , &data); -return 0 ; -} - -int RtmpEfuseSupportCheck ( IN RTMP_ADAPTER *pAd) {
drivers/staging/rt2860/common/ee_prom.c +0 -48
51 lines not on this page · raw message
drivers/staging/rt2860/common/eeprom.c +0 -3
@@ -66,7 +66,6 @@ INT RtmpChipOpsEepromHook( { pChipOps->eeinit = eFuse_init; pChipOps->eeread = rtmp_ee_efuse_read16; - pChipOps->eewrite = rtmp_ee_efuse_write16;return 0 ; } else
@@ -83,14 +82,12 @@ INT RtmpChipOpsEepromHook(case RTMP_DEV_INF_PCI : pChipOps->eeinit =NULL ; pChipOps->eeread = rtmp_ee_prom_read16; - pChipOps->eewrite = rtmp_ee_prom_write16;break ;#endif // RTMP_PCI_SUPPORT // #ifdef RTMP_USB_SUPPORT case RTMP_DEV_INF_USB : pChipOps->eeinit =NULL ; pChipOps->eeread = RTUSBReadEEPROM16; - pChipOps->eewrite = RTUSBWriteEEPROM16;break ;#endif // RTMP_USB_SUPPORT //
drivers/staging/rt2860/eeprom.h +0 -15
@@ -48,11 +48,6 @@ int rtmp_ee_prom_read16( IN PRTMP_ADAPTER pAd, IN USHORT Offset, OUT USHORT *pValue); - -int rtmp_ee_prom_write16 ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN USHORT value);#endif // RTMP_PCI_SUPPORT // #ifdef RTMP_USB_SUPPORT /*************************************************************************
@@ -62,11 +57,6 @@ NTSTATUS RTUSBReadEEPROM16( IN PRTMP_ADAPTER pAd, IN USHORT offset, OUT PUSHORT pData); - -NTSTATUS RTUSBWriteEEPROM16 ( - IN RTMP_ADAPTER *pAd, - IN USHORT offset, - IN USHORT value);#endif // RTMP_USB_SUPPORT // #ifdef RT30xx
@@ -75,11 +65,6 @@ int rtmp_ee_efuse_read16( IN RTMP_ADAPTER *pAd, IN USHORT Offset, OUT USHORT *pValue); - -int rtmp_ee_efuse_write16 ( - IN RTMP_ADAPTER *pAd, - IN USHORT Offset, - IN USHORT data);#endif // RTMP_EFUSE_SUPPORT // #endif // RT30xx //
drivers/staging/rt2860/rtmp.h +0 -1
@@ -1790,7 +1790,6 @@ struct _RTMP_CHIP_OP_/* Calibration access related callback functions */ int (*eeinit)(RTMP_ADAPTER *pAd);/* int (*eeinit)(RTMP_ADAPTER *pAd); */ int (*eeread)(RTMP_ADAPTER *pAd,USHORT offset,PUSHORT pValue);/* int (*eeread)(RTMP_ADAPTER *pAd, int offset, PUSHORT pValue); */ -int (*eewrite)(RTMP_ADAPTER *pAd,USHORT offset,USHORT value);;/* int (*eewrite)(RTMP_ADAPTER *pAd, int offset, USHORT value); */ /* MCU related callback functions */ int (*loadFirmware)(RTMP_ADAPTER *pAd);/* int (*loadFirmware)(RTMP_ADAPTER *pAd); */
drivers/staging/rt2860/rtmp_chip.h +0 -4
@@ -167,10 +167,6 @@#define RT28xx_EEPROM_READ16 (_pAd, _offset, _value) \ (_pAd)->chipOps.eeread((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (PUSHORT)&(_value)) -#define RT28xx_EEPROM_WRITE16 (_pAd, _offset, _value) \ - (_pAd)->chipOps.eewrite((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (USHORT)(_value)) - -// ------------------------------------------------------------------- // E2PROM data layout
drivers/staging/rt2870/common/rtusb_io.c +0 -11
@@ -619,17 +619,6 @@ NTSTATUS RTUSBReadEEPROM16( } -NTSTATUS RTUSBWriteEEPROM16 ( - IN RTMP_ADAPTER *pAd, - IN USHORT offset, - IN USHORT value) -{ -USHORT tmpVal; - - tmpVal =cpu2le16 (value); -return RTUSBWriteEEPROM (pAd, offset, (PUCHAR )&(tmpVal),2 ); -} -/* ========================================================================
PATCH 2/12 Staging: rt28x0: remove unused code from common/ee_efuse-c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove unused code from common/ee_efuse-c
--- drivers/staging/rt2860/common/ee_efuse.c | 340 ------------------------------- drivers/staging/rt2860/rtmp.h | 12 - 2 files changed, 352 deletions(-)
drivers/staging/rt2860/common/ee_efuse.c +0 -340
@@ -67,31 +67,6 @@ typedef union _EFUSE_CTRL_STRUC {UINT32 word; }EFUSE_CTRL_STRUC , *PEFUSE_CTRL_STRUC ; -static UCHAR eFuseReadRegisters ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN USHORT Length, - OUT USHORT* pData); - -static VOID eFuseReadPhysical ( - IN PRTMP_ADAPTER pAd, - IN PUSHORT lpInBuffer, - IN ULONG nInBufferSize, - OUT PUSHORT lpOutBuffer, - IN ULONG nOutBufferSize); - -static VOID eFusePhysicalWriteRegisters ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN USHORT Length, - OUT USHORT* pData); - -static NTSTATUS eFuseWriteRegisters ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN USHORT Length, - IN USHORT* pData); - static VOID eFuseWritePhysical( IN PRTMP_ADAPTER pAd, PUSHORT lpInBuffer,
@@ -306,37 +281,6 @@ static VOID eFuseReadPhysical(======================================================================== */ -NTSTATUS eFuseRead ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - OUT PUCHAR pData, - IN USHORT Length) -{ -USHORT * pOutBuf = (USHORT *)pData; -NTSTATUS Status =STATUS_SUCCESS ; -UCHAR EFSROM_AOUT ; -int i; - -for (i=0 ; i<Length; i+=2 ) - { -EFSROM_AOUT =eFuseReadRegisters (pAd, Offset+i,2 , &pOutBuf[i/2 ]); - } -return Status; -} - -/* -======================================================================== - -Routine Description: - -Arguments: - -Return Value: - -Note: - -======================================================================== -*/ static VOID eFusePhysicalWriteRegisters( IN PRTMP_ADAPTER pAd, IN USHORT Offset,
@@ -450,247 +394,6 @@ static VOID eFusePhysicalWriteRegisters(======================================================================== */ -static NTSTATUS eFuseWriteRegisters ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN USHORT Length, - IN USHORT* pData) -{ -USHORT i,Loop=0 ; -USHORT eFuseData; -USHORT LogicalAddress, BlkNum =0xffff ; -UCHAR EFSROM_AOUT ; - -USHORT addr,tmpaddr, InBuf[3 ], tmpOffset; -USHORT buffer[8 ]; -BOOLEAN bWriteSuccess = TRUE; - -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters Offset=%x, pData=%x\n" , Offset, *pData)); - -//Step 0. find the entry in the mapping table -//The address of EEPROM is 2-bytes alignment. -//The last bit is used for alignment, so it must be 0. - tmpOffset = Offset &0xfffe ; -EFSROM_AOUT =eFuseReadRegisters (pAd, tmpOffset,2 , &eFuseData); - -if (EFSROM_AOUT ==0x3f ) - {//find available logical address pointer -//the logical address does not exist, find an empty one -//from the first address of block 45=16*45=0x2d0 to the last address of block 47 -//==>48*16-3(reserved)=2FC -for (i=EFUSE_USAGE_MAP_START ; i<=EFUSE_USAGE_MAP_END ; i+=2 ) - { -//Retrive the logical block nubmer form each logical address pointer -//It will access two logical address pointer each time. -eFusePhysicalReadRegisters (pAd, i,2 , &LogicalAddress); -if ( (LogicalAddress &0xff ) ==0 ) - {//Not used logical address pointer - BlkNum = i-EFUSE_USAGE_MAP_START ; -break ; - } -else if (( (LogicalAddress >>8 ) &0xff ) ==0 ) - {//Not used logical address pointer -if (i !=EFUSE_USAGE_MAP_END ) - { - BlkNum = i-EFUSE_USAGE_MAP_START +1 ; - } -break ; - } - } - } -else - { - BlkNum =EFSROM_AOUT ; - } - -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters BlkNum = %d \n" , BlkNum)); - -if (BlkNum ==0xffff ) - { -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!!!\n" )); -return FALSE; - } - -//Step 1. Save data of this block which is pointed by the avaible logical address pointer -// read and save the original block data -for (i =0 ; i<8 ; i++) - { - addr = BlkNum *0x10 ; - - InBuf[0 ] = addr+2 *i; - InBuf[1 ] =2 ; - InBuf[2 ] =0x0 ; - -eFuseReadPhysical (pAd, &InBuf[0 ],4 , &InBuf[2 ],2 ); - - buffer[i] = InBuf[2 ]; - } - -//Step 2. Update the data in buffer, and write the data to Efuse - buffer[ (Offset >>1 ) %8 ] = pData[0 ]; - -do - { Loop++; -//Step 3. Write the data to Efuse -if (!bWriteSuccess) - { -for (i =0 ; i<8 ; i++) - { - addr = BlkNum *0x10 ; - - InBuf[0 ] = addr+2 *i; - InBuf[1 ] =2 ; - InBuf[2 ] = buffer[i]; - -eFuseWritePhysical (pAd, &InBuf[0 ],6 ,NULL ,2 ); - } - } -else - { - addr = BlkNum *0x10 ; - - InBuf[0 ] = addr+(Offset %16 ); - InBuf[1 ] =2 ; - InBuf[2 ] = pData[0 ]; - -eFuseWritePhysical (pAd, &InBuf[0 ],6 ,NULL ,2 ); - } - -//Step 4. Write mapping table - addr =EFUSE_USAGE_MAP_START +BlkNum; - - tmpaddr = addr; - -if (addr %2 !=0 ) - addr = addr -1 ; - InBuf[0 ] = addr; - InBuf[1 ] =2 ; - -//convert the address from 10 to 8 bit ( bit7, 6 = parity and bit5 ~ 0 = bit9~4), and write to logical map entry - tmpOffset = Offset; - tmpOffset >>=4 ; - tmpOffset |= ((~((tmpOffset &0x01 ) ^ ( tmpOffset >>1 &0x01 ) ^ (tmpOffset >>2 &0x01 ) ^ (tmpOffset >>3 &0x01 ))) <<6 ) &0x40 ; - tmpOffset |= ((~( (tmpOffset >>2 &0x01 ) ^ (tmpOffset >>3 &0x01 ) ^ (tmpOffset >>4 &0x01 ) ^ ( tmpOffset >>5 &0x01 ))) <<7 ) &0x80 ; - -// write the logical address -if (tmpaddr%2 !=0 ) - InBuf[2 ] = tmpOffset<<8 ; -else - InBuf[2 ] = tmpOffset; - -eFuseWritePhysical (pAd,&InBuf[0 ],6 ,NULL ,0 ); - -//Step 5. Compare data if not the same, invalidate the mapping entry, then re-write the data until E-fuse is exhausted - bWriteSuccess = TRUE; -for (i =0 ; i<8 ; i++) - { - addr = BlkNum *0x10 ; - - InBuf[0 ] = addr+2 *i; - InBuf[1 ] =2 ; - InBuf[2 ] =0x0 ; - -eFuseReadPhysical (pAd, &InBuf[0 ],4 , &InBuf[2 ],2 ); - -if (buffer[i] != InBuf[2 ]) - { - bWriteSuccess = FALSE; -break ; - } - } - -//Step 6. invlidate mapping entry and find a free mapping entry if not succeed -if (!bWriteSuccess) - { -DBGPRINT (RT_DEBUG_TRACE , ("Not bWriteSuccess BlkNum = %d\n" , BlkNum)); - -// the offset of current mapping entry - addr =EFUSE_USAGE_MAP_START +BlkNum; - -//find a new mapping entry - BlkNum =0xffff ; -for (i=EFUSE_USAGE_MAP_START ; i<=EFUSE_USAGE_MAP_END ; i+=2 ) - { -eFusePhysicalReadRegisters (pAd, i,2 , &LogicalAddress); -if ( (LogicalAddress &0xff ) ==0 ) - { - BlkNum = i-EFUSE_USAGE_MAP_START ; -break ; - } -else if (( (LogicalAddress >>8 ) &0xff ) ==0 ) - { -if (i !=EFUSE_USAGE_MAP_END ) - { - BlkNum = i+1 -EFUSE_USAGE_MAP_START ; - } -break ; - } - } -DBGPRINT (RT_DEBUG_TRACE , ("Not bWriteSuccess new BlkNum = %d\n" , BlkNum)); -if (BlkNum ==0xffff ) - { -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!!!\n" )); -return FALSE; - } - -//invalidate the original mapping entry if new entry is not found - tmpaddr = addr; - -if (addr %2 !=0 ) - addr = addr -1 ; - InBuf[0 ] = addr; - InBuf[1 ] =2 ; - -eFuseReadPhysical (pAd, &InBuf[0 ],4 , &InBuf[2 ],2 ); - -// write the logical address -if (tmpaddr%2 !=0 ) - { -// Invalidate the high byte -for (i=8 ; i<15 ; i++) - { -if ( ( (InBuf[2 ] >> i) &0x01 ) ==0 ) - { - InBuf[2 ] |= (0x1 <<i); -break ; - } - } - } -else - { -// invalidate the low byte -for (i=0 ; i<8 ; i++) - { -if ( ( (InBuf[2 ] >> i) &0x01 ) ==0 ) - { - InBuf[2 ] |= (0x1 <<i); -break ; - } - } - } -eFuseWritePhysical (pAd, &InBuf[0 ],6 ,NULL ,0 ); - } - } -while (!bWriteSuccess&&Loop<2 ); -if (!bWriteSuccess) -DBGPRINT (RT_DEBUG_ERROR ,("Efsue Write Failed!!\n" )); -return TRUE; -} - - -/* -======================================================================== - -Routine Description: - -Arguments: - -Return Value: - -Note: - -======================================================================== -*/ static VOID eFuseWritePhysical( IN PRTMP_ADAPTER pAd, PUSHORT lpInBuffer,
@@ -723,49 +426,6 @@ static VOID eFuseWritePhysical( } } - -/* -======================================================================== - -Routine Description: - -Arguments: - -Return Value: - -Note: - -======================================================================== -*/ -NTSTATUS eFuseWrite ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN PUCHAR pData, - IN USHORT length) -{ -int i; -USHORT * pValueX = (PUSHORT ) pData;//value ... - -// The input value=3070 will be stored as following -// Little-endian S | S Big-endian -// addr 1 0 | 0 1 -// Ori-V 30 70 | 30 70 -// After swapping -// 30 70 | 70 30 -// Casting -// 3070 | 7030 (x) -// The swapping should be removed for big-endian -for (i=0 ; i<length; i+=2 ) - { -eFuseWriteRegisters (pAd, Offset+i,2 , &pValueX[i/2 ]); - } - -return TRUE; -} - - - -/* ========================================================================
drivers/staging/rt2860/rtmp.h +0 -12
@@ -4052,18 +4052,6 @@ VOID eFuseGetFreeBlockCount(IN PRTMP_ADAINT eFuse_init ( IN PRTMP_ADAPTER pAd); - -NTSTATUS eFuseRead ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - OUT PUCHAR pData, - IN USHORT Length); - -NTSTATUS eFuseWrite ( - IN PRTMP_ADAPTER pAd, - IN USHORT Offset, - IN PUCHAR pData, - IN USHORT length);//2008/09/11:KH add to support efuse--> #endif // RTMP_EFUSE_SUPPORT //
PATCH 3/12 Staging: rt28x0: remove private RTPRIV_IOCTL_SET ioctl
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove private RTPRIV_IOCTL_SET ioctl
--- drivers/staging/rt2860/sta_ioctl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/staging/rt2860/sta_ioctl.c +1 -5
@@ -2978,6 +2978,7 @@ INT rt28xx_sta_ioctl(case SIOCSIWRETRY ://set retry limits and lifetime case RT_PRIV_IOCTL :case RT_PRIV_IOCTL_EXT : +case RTPRIV_IOCTL_SET : Status = -EOPNOTSUPP ;break ;case SIOCGIWPRIV :
@@ -2990,11 +2991,6 @@ INT rt28xx_sta_ioctl( Status = -EFAULT ; }break ; -case RTPRIV_IOCTL_SET : -if (access_ok (VERIFY_READ , wrq->u.data.pointer, wrq->u.data.length) != TRUE) -break ; -rt_ioctl_setparam (net_dev,NULL ,NULL , wrq->u.data.pointer); -break ;case RTPRIV_IOCTL_GSITESURVEY :RTMPIoctlGetSiteSurvey (pAd, wrq);break ;
PATCH 4/12 Staging: rt28x0: remove private RTPRIV_IOCTL_GSITESURVEY ioctl
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove private RTPRIV_IOCTL_GSITESURVEY ioctl
--- drivers/staging/rt2860/common/cmm_info.c | 57 ------------------------------- drivers/staging/rt2860/rtmp.h | 12 ------ drivers/staging/rt2860/sta_ioctl.c | 4 -- 3 files changed, 1 insertion(+), 72 deletions(-)
drivers/staging/rt2860/common/cmm_info.c +0 -57
@@ -1970,63 +1970,6 @@ VOID RTMPCommSiteSurveyData(return ; } -VOID RTMPIoctlGetSiteSurvey ( - IN PRTMP_ADAPTER pAdapter, - IN struct iwreq *wrq) -{ -PSTRING msg; -INT i=0 ; -INT WaitCnt; -INT Status=0 ; -INT max_len =LINE_LEN ; -PBSS_ENTRY pBss; - - -os_alloc_mem (NULL , (PUCHAR *)&msg,sizeof (CHAR )*((MAX_LEN_OF_BSS_TABLE )*max_len)); - -if (msg ==NULL ) - { -DBGPRINT (RT_DEBUG_TRACE , ("RTMPIoctlGetSiteSurvey - msg memory alloc fail.\n" )); -return ; - } - -memset (msg,0 ,(MAX_LEN_OF_BSS_TABLE )*max_len ); -sprintf (msg,"%s" ,"\n" ); -sprintf (msg+strlen (msg),"%-4s%-33s%-20s%-23s%-9s%-7s%-7s%-3s\n" , -"Ch" ,"SSID" ,"BSSID" ,"Security" ,"Siganl(%)" ,"W-Mode" ," ExtCH" ," NT" ); - - - - WaitCnt =0 ; - pAdapter->StaCfg.bScanReqIsFromWebUI = TRUE; -while ((ScanRunning (pAdapter) == TRUE) && (WaitCnt++ <200 )) -OS_WAIT (500 ); - -for (i=0 ; i<pAdapter->ScanTab.BssNr ;i++) - { - pBss = &pAdapter->ScanTab.BssEntry[i]; - -if ( pBss->Channel==0 ) -break ; - -if ((strlen (msg)+max_len ) >=IW_SCAN_MAX_DATA ) -break ; - - -RTMPCommSiteSurveyData (msg, pBss); - - - } - - pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE; - wrq->u.data.length =strlen (msg); - Status =copy_to_user (wrq->u.data.pointer, msg, wrq->u.data.length); - -DBGPRINT (RT_DEBUG_TRACE , ("RTMPIoctlGetSiteSurvey - wrq->u.data.length = %d\n" , wrq->u.data.length)); -os_free_mem (NULL , (PUCHAR )msg); -} - -#define MAC_LINE_LEN (14+4+4+10+10+10+6+6) // Addr+aid+psm+datatime+rxbyte+txbyte+current tx rate+last tx rate VOID RTMPIoctlGetMacTable( IN PRTMP_ADAPTER pAd,
drivers/staging/rt2860/rtmp.h +0 -12
@@ -4991,18 +4991,6 @@ PNDIS_PACKET RTMPDeFragmentDataFrame( IN PRTMP_ADAPTER pAd, IN RX_BLK *pRxBlk); -//////////////////////////////////////// - -VOID RTMPIoctlGetSiteSurvey ( - IN PRTMP_ADAPTER pAdapter, - IN struct iwreq *wrq); - - - - - - -enum { DIDmsg_lnxind_wlansniffrm =0x00000044 , DIDmsg_lnxind_wlansniffrm_hosttime =0x00010044 ,
drivers/staging/rt2860/sta_ioctl.c +1 -3
@@ -2979,6 +2979,7 @@ INT rt28xx_sta_ioctl(case RT_PRIV_IOCTL :case RT_PRIV_IOCTL_EXT :case RTPRIV_IOCTL_SET : +case RTPRIV_IOCTL_GSITESURVEY : Status = -EOPNOTSUPP ;break ;case SIOCGIWPRIV :
@@ -2991,9 +2992,6 @@ INT rt28xx_sta_ioctl( Status = -EFAULT ; }break ; -case RTPRIV_IOCTL_GSITESURVEY : -RTMPIoctlGetSiteSurvey (pAd, wrq); -break ;case SIOCETHTOOL :break ;default :
PATCH 6/12 Staging: rt28x0: remove support for private driver parameters
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove support for private driver parameters
--- drivers/staging/rt2860/Makefile | 1 drivers/staging/rt2860/common/cmm_info.c | 2 drivers/staging/rt2860/common/rtmp_init.c | 9 -- drivers/staging/rt2860/rt_profile.c | 95 ------------------------------ drivers/staging/rt2860/rtmp.h | 3 drivers/staging/rt2870/Makefile | 1 6 files changed, 1 insertion(+), 110 deletions(-)
drivers/staging/rt2860/Makefile +0 -1
@@ -38,7 +38,6 @@ rt2860sta-objs := \ sta/connect.o \ sta/wpa.o \ rt_linux.o \ - rt_profile.o \ rt_main_dev.o \ sta_ioctl.o \ common/ba_action.o \
drivers/staging/rt2860/common/rtmp_init.c +0 -9
@@ -3439,16 +3439,7 @@ int rt28xx_init( goto err3; } -// Read parameters from Config File - Status =RTMPReadParametersHook (pAd); -DBGPRINT (RT_DEBUG_OFF , ("1. Phy Mode = %d\n" , pAd->CommonCfg.PhyMode)); -if (Status !=NDIS_STATUS_SUCCESS ) - { -DBGPRINT_ERR (("NICReadRegParameters failed, Status[=0x%08x]\n" ,Status)); -// goto err4; - Status =0 ; - }#ifdef RTMP_MAC_USB pAd->CommonCfg.bMultipleIRP = FALSE;
drivers/staging/rt2860/rt_profile.c deleted +0 -95
95 lines not on this page · raw message
drivers/staging/rt2860/rtmp.h +0 -3
@@ -2453,9 +2453,6 @@ NDIS_STATUS RTMPAllocAdapterBlock(NDIS_STATUS RTMPAllocTxRxRingMemory ( IN PRTMP_ADAPTER pAd); -NDIS_STATUS RTMPReadParametersHook ( - IN PRTMP_ADAPTER pAd); -NDIS_STATUS RTMPSetProfileParameters ( IN RTMP_ADAPTER *pAd, IN PSTRING pBuffer);
drivers/staging/rt2870/Makefile +0 -1
@@ -39,7 +39,6 @@ rt2870sta-objs := \ sta/connect.o \ sta/wpa.o \ rt_linux.o \ - rt_profile.o \ rt_main_dev.o \ sta_ioctl.o \ common/ba_action.o \
PATCH 5/12 Staging: rt28x0: remove private WEXT handlers
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove private WEXT handlers
--- drivers/staging/rt2860/common/cmm_info.c | 3982 +++++-------------------------- drivers/staging/rt2860/rtmp.h | 204 - drivers/staging/rt2860/sta_ioctl.c | 1305 ---------- 3 files changed, 767 insertions(+), 4724 deletions(-)
drivers/staging/rt2860/common/cmm_info.c +766 -3216
@@ -27,3380 +27,930 @@#include "../rt_config.h" +/* +======================================================================== -INT Show_SSID_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_WirelessMode_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_TxBurst_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_TxPreamble_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_TxPower_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_Channel_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_BGProtection_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_RTSThreshold_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_FragThreshold_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtBw_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtMcs_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtGi_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtOpMode_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtExtcha_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtMpduDensity_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtBaWinSize_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtRdg_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtAmsdu_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_HtAutoBa_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_CountryRegion_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_CountryRegionABand_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_CountryCode_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -#ifdef AGGREGATION_SUPPORT -INT Show_PktAggregate_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); -#endif // AGGREGATION_SUPPORT // - -#ifdef WMM_SUPPORT -INT Show_WmmCapable_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); -#endif // WMM_SUPPORT // - -INT Show_IEEE80211H_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_NetworkType_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - - -INT Show_AuthMode_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_EncrypType_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_DefaultKeyID_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_Key1_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_Key2_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_Key3_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_Key4_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -INT Show_WPAPSK_Proc ( - IN PRTMP_ADAPTER pAd, - OUT PSTRING pBuf); - -static struct { -PSTRING name; -INT (*show_proc)(PRTMP_ADAPTER pAdapter,PSTRING arg); -} *PRTMP_PRIVATE_STA_SHOW_CFG_VALUE_PROC ,RTMP_PRIVATE_STA_SHOW_CFG_VALUE_PROC [] = { - {"SSID" , Show_SSID_Proc}, - {"WirelessMode" , Show_WirelessMode_Proc}, - {"TxBurst" , Show_TxBurst_Proc}, - {"TxPreamble" , Show_TxPreamble_Proc}, - {"TxPower" , Show_TxPower_Proc}, - {"Channel" , Show_Channel_Proc}, - {"BGProtection" , Show_BGProtection_Proc}, - {"RTSThreshold" , Show_RTSThreshold_Proc}, - {"FragThreshold" , Show_FragThreshold_Proc}, - {"HtBw" , Show_HtBw_Proc}, - {"HtMcs" , Show_HtMcs_Proc}, - {"HtGi" , Show_HtGi_Proc}, - {"HtOpMode" , Show_HtOpMode_Proc}, - {"HtExtcha" , Show_HtExtcha_Proc}, - {"HtMpduDensity" , Show_HtMpduDensity_Proc}, - {"HtBaWinSize" , Show_HtBaWinSize_Proc}, - {"HtRdg" , Show_HtRdg_Proc}, - {"HtAmsdu" , Show_HtAmsdu_Proc}, - {"HtAutoBa" , Show_HtAutoBa_Proc}, - {"CountryRegion" , Show_CountryRegion_Proc}, - {"CountryRegionABand" , Show_CountryRegionABand_Proc}, - {"CountryCode" , Show_CountryCode_Proc}, -#ifdef AGGREGATION_SUPPORT - {"PktAggregate" , Show_PktAggregate_Proc}, -#endif - -#ifdef WMM_SUPPORT - {"WmmCapable" , Show_WmmCapable_Proc}, -#endif - {"IEEE80211H" , Show_IEEE80211H_Proc}, - {"NetworkType" , Show_NetworkType_Proc}, - {"AuthMode" , Show_AuthMode_Proc}, - {"EncrypType" , Show_EncrypType_Proc}, - {"DefaultKeyID" , Show_DefaultKeyID_Proc}, - {"Key1" , Show_Key1_Proc}, - {"Key2" , Show_Key2_Proc}, - {"Key3" , Show_Key3_Proc}, - {"Key4" , Show_Key4_Proc}, - {"WPAPSK" , Show_WPAPSK_Proc}, - {NULL ,NULL } -}; - -/* -========================================================================== -Description: -Get Driver version. - -Return: -========================================================================== -*/ -INT Set_DriverVersion_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ - -DBGPRINT (RT_DEBUG_TRACE , ("Driver version-%s\n" ,STA_DRIVER_VERSION )); - -return TRUE; -} - -/* -========================================================================== -Description: -Set Country Region. -This command will not work, if the field of CountryRegion in eeprom is programmed. -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_CountryRegion_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -int retval; - - - retval =RT_CfgSetCountryRegion (pAd, arg,BAND_24G ); -if (retval == FALSE) -return FALSE; - -// if set country region, driver needs to be reset -BuildChannelList (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_CountryRegion_Proc::(CountryRegion=%d)\n" , pAd->CommonCfg.CountryRegion)); - -return TRUE; -} - -/* -========================================================================== -Description: -Set Country Region for A band. -This command will not work, if the field of CountryRegion in eeprom is programmed. -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_CountryRegionABand_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -int retval; - - - retval =RT_CfgSetCountryRegion (pAd, arg,BAND_5G ); -if (retval == FALSE) -return FALSE; - -// if set country region, driver needs to be reset -BuildChannelList (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_CountryRegionABand_Proc::(CountryRegion=%d)\n" , pAd->CommonCfg.CountryRegionForABand)); - -return TRUE; -} - -/* -========================================================================== -Description: -Set Wireless Mode -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_WirelessMode_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -INT success = TRUE; - - success =RT_CfgSetWirelessMode (pAd, arg); -if (success) - { - { -LONG WirelessMode = pAd->CommonCfg.PhyMode; - -RTMPSetPhyMode (pAd, WirelessMode); -if (WirelessMode >=PHY_11ABGN_MIXED ) - { - pAd->CommonCfg.BACapability.field.AutoBA = TRUE; - pAd->CommonCfg.REGBACapability.field.AutoBA = TRUE; - } -else - { - pAd->CommonCfg.BACapability.field.AutoBA = FALSE; - pAd->CommonCfg.REGBACapability.field.AutoBA = FALSE; - } - -// Set AdhocMode rates -if (pAd->StaCfg.BssType ==BSS_ADHOC ) - { -MlmeUpdateTxRates (pAd, FALSE,0 ); -MakeIbssBeacon (pAd);// re-build BEACON frame -AsicEnableIbssSync (pAd);// copy to on-chip memory - } - } - -// it is needed to set SSID to take effect -SetCommonHT (pAd); -DBGPRINT (RT_DEBUG_TRACE , ("Set_WirelessMode_Proc::(=%d)\n" , pAd->CommonCfg.PhyMode)); - } -else - { -DBGPRINT (RT_DEBUG_ERROR , ("Set_WirelessMode_Proc::parameters out of range\n" )); - } - -return success; -} - -/* -========================================================================== -Description: -Set Channel -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_Channel_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -INT success = TRUE; -UCHAR Channel; - - Channel = (UCHAR )simple_strtol (arg,0 ,10 ); - -// check if this channel is valid -if (ChannelSanity (pAd, Channel) == TRUE) - { - { - pAd->CommonCfg.Channel = Channel; - -if (MONITOR_ON (pAd)) - { -N_ChannelCheck (pAd); -if (pAd->CommonCfg.PhyMode >=PHY_11ABGN_MIXED && - pAd->CommonCfg.RegTransmitSetting.field.BW ==BW_40 ) - { -N_SetCenCh (pAd); -AsicSwitchChannel (pAd, pAd->CommonCfg.CentralChannel, FALSE); -AsicLockChannel (pAd, pAd->CommonCfg.CentralChannel); -DBGPRINT (RT_DEBUG_TRACE , ("BW_40, control_channel(%d), CentralChannel(%d) \n" , - pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel)); - } -else - { -AsicSwitchChannel (pAd, pAd->CommonCfg.Channel, FALSE); -AsicLockChannel (pAd, pAd->CommonCfg.Channel); -DBGPRINT (RT_DEBUG_TRACE , ("BW_20, Channel(%d)\n" , pAd->CommonCfg.Channel)); - } - } - } - success = TRUE; - } -else - { - success = FALSE; - } - - -if (success == TRUE) -DBGPRINT (RT_DEBUG_TRACE , ("Set_Channel_Proc::(Channel=%d)\n" , pAd->CommonCfg.Channel)); - -return success; -} - -/* -========================================================================== -Description: -Set Short Slot Time Enable or Disable -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_ShortSlot_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -int retval; - - retval =RT_CfgSetShortSlot (pAd, arg); -if (retval == TRUE) -DBGPRINT (RT_DEBUG_TRACE , ("Set_ShortSlot_Proc::(ShortSlot=%d)\n" , pAd->CommonCfg.bUseShortSlotTime)); - -return retval; -} - - -/* -========================================================================== -Description: -Set Tx power -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_TxPower_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -LONG TxPower; -INT success = FALSE; - - TxPower =simple_strtol (arg,0 ,10 ); -if (TxPower <=100 ) - { - { - pAd->CommonCfg.TxPowerDefault = TxPower; - pAd->CommonCfg.TxPowerPercentage = pAd->CommonCfg.TxPowerDefault; - } - success = TRUE; - } -else - success = FALSE; - -DBGPRINT (RT_DEBUG_TRACE , ("Set_TxPower_Proc::(TxPowerPercentage=%ld)\n" , pAd->CommonCfg.TxPowerPercentage)); - -return success; -} - -/* -========================================================================== -Description: -Set 11B/11G Protection -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_BGProtection_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -switch (simple_strtol (arg,0 ,10 )) - { -case 0 ://AUTO - pAd->CommonCfg.UseBGProtection =0 ; -break ; -case 1 ://Always On - pAd->CommonCfg.UseBGProtection =1 ; -break ; -case 2 ://Always OFF - pAd->CommonCfg.UseBGProtection =2 ; -break ; -default ://Invalid argument -return FALSE; - } - - -DBGPRINT (RT_DEBUG_TRACE , ("Set_BGProtection_Proc::(BGProtection=%ld)\n" , pAd->CommonCfg.UseBGProtection)); - -return TRUE; -} - -/* -========================================================================== -Description: -Set TxPreamble -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_TxPreamble_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -RT_802_11_PREAMBLE Preamble; - - Preamble =simple_strtol (arg,0 ,10 ); - - -switch (Preamble) - { -case Rt802_11PreambleShort: - pAd->CommonCfg.TxPreamble = Preamble; - -MlmeSetTxPreamble (pAd, Rt802_11PreambleShort); -break ; -case Rt802_11PreambleLong: -case Rt802_11PreambleAuto: -// if user wants AUTO, initialize to LONG here, then change according to AP's -// capability upon association. - pAd->CommonCfg.TxPreamble = Preamble; - -MlmeSetTxPreamble (pAd, Rt802_11PreambleLong); -break ; -default ://Invalid argument -return FALSE; - } - -DBGPRINT (RT_DEBUG_TRACE , ("Set_TxPreamble_Proc::(TxPreamble=%ld)\n" , pAd->CommonCfg.TxPreamble)); - -return TRUE; -} - -/* -========================================================================== -Description: -Set RTS Threshold -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_RTSThreshold_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -NDIS_802_11_RTS_THRESHOLD RtsThresh; - - RtsThresh =simple_strtol (arg,0 ,10 ); - -if ((RtsThresh >0 ) && (RtsThresh <=MAX_RTS_THRESHOLD )) - pAd->CommonCfg.RtsThreshold = (USHORT )RtsThresh; -else if (RtsThresh ==0 ) - pAd->CommonCfg.RtsThreshold =MAX_RTS_THRESHOLD ; -else -return FALSE;//Invalid argument - -DBGPRINT (RT_DEBUG_TRACE , ("Set_RTSThreshold_Proc::(RTSThreshold=%d)\n" , pAd->CommonCfg.RtsThreshold)); - -return TRUE; -} - -/* -========================================================================== -Description: -Set Fragment Threshold -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_FragThreshold_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -NDIS_802_11_FRAGMENTATION_THRESHOLD FragThresh; - - FragThresh =simple_strtol (arg,0 ,10 ); - -if (FragThresh >MAX_FRAG_THRESHOLD || FragThresh <MIN_FRAG_THRESHOLD ) - { -//Illegal FragThresh so we set it to default - pAd->CommonCfg.FragmentThreshold =MAX_FRAG_THRESHOLD ; - } -else if (FragThresh %2 ==1 ) - { -// The length of each fragment shall always be an even number of octets, except for the last fragment -// of an MSDU or MMPDU, which may be either an even or an odd number of octets. - pAd->CommonCfg.FragmentThreshold = (USHORT )(FragThresh -1 ); - } -else - { - pAd->CommonCfg.FragmentThreshold = (USHORT )FragThresh; - } - - { -if (pAd->CommonCfg.FragmentThreshold ==MAX_FRAG_THRESHOLD ) - pAd->CommonCfg.bUseZeroToDisableFragment = TRUE; -else - pAd->CommonCfg.bUseZeroToDisableFragment = FALSE; - } - -DBGPRINT (RT_DEBUG_TRACE , ("Set_FragThreshold_Proc::(FragThreshold=%d)\n" , pAd->CommonCfg.FragmentThreshold)); - -return TRUE; -} - -/* -========================================================================== -Description: -Set TxBurst -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_TxBurst_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -LONG TxBurst; - - TxBurst =simple_strtol (arg,0 ,10 ); -if (TxBurst ==1 ) - pAd->CommonCfg.bEnableTxBurst = TRUE; -else if (TxBurst ==0 ) - pAd->CommonCfg.bEnableTxBurst = FALSE; -else -return FALSE;//Invalid argument - -DBGPRINT (RT_DEBUG_TRACE , ("Set_TxBurst_Proc::(TxBurst=%d)\n" , pAd->CommonCfg.bEnableTxBurst)); - -return TRUE; -} - -#ifdef AGGREGATION_SUPPORT -/* -========================================================================== -Description: -Set TxBurst -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_PktAggregate_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -LONG aggre; - - aggre =simple_strtol (arg,0 ,10 ); - -if (aggre ==1 ) - pAd->CommonCfg.bAggregationCapable = TRUE; -else if (aggre ==0 ) - pAd->CommonCfg.bAggregationCapable = FALSE; -else -return FALSE;//Invalid argument - - -DBGPRINT (RT_DEBUG_TRACE , ("Set_PktAggregate_Proc::(AGGRE=%d)\n" , pAd->CommonCfg.bAggregationCapable)); - -return TRUE; -} -#endif - -/* -========================================================================== -Description: -Set IEEE80211H. -This parameter is 1 when needs radar detection, otherwise 0 -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_IEEE80211H_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -LONG ieee80211h; - - ieee80211h =simple_strtol (arg,0 ,10 ); - -if (ieee80211h ==1 ) - pAd->CommonCfg.bIEEE80211H = TRUE; -else if (ieee80211h ==0 ) - pAd->CommonCfg.bIEEE80211H = FALSE; -else -return FALSE;//Invalid argument - -DBGPRINT (RT_DEBUG_TRACE , ("Set_IEEE80211H_Proc::(IEEE80211H=%d)\n" , pAd->CommonCfg.bIEEE80211H)); - -return TRUE; -} - - -#ifdef DBG -/* -========================================================================== -Description: -For Debug information -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_Debug_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -DBGPRINT (RT_DEBUG_TRACE , ("==> Set_Debug_Proc *******************\n" )); - -if (simple_strtol (arg,0 ,10 ) <=RT_DEBUG_LOUD ) - RTDebugLevel =simple_strtol (arg,0 ,10 ); - -DBGPRINT (RT_DEBUG_TRACE , ("<== Set_Debug_Proc(RTDebugLevel = %ld)\n" , RTDebugLevel)); - -return TRUE; -} -#endif - -INT Show_DescInfo_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -#ifdef RTMP_MAC_PCI -INT i, QueIdx=0 ; -// ULONG RegValue; -PRT28XX_RXD_STRUC pRxD; -PTXD_STRUC pTxD; -PRTMP_TX_RING pTxRing = &pAd->TxRing[QueIdx]; -PRTMP_MGMT_RING pMgmtRing = &pAd->MgmtRing; -PRTMP_RX_RING pRxRing = &pAd->RxRing; - -for (i=0 ;i<TX_RING_SIZE ;i++) - { - pTxD = (PTXD_STRUC ) pTxRing->Cell[i].AllocVa; -DBGPRINT (RT_DEBUG_OFF , ("Desc #%d\n" ,i)); -hex_dump ("Tx Descriptor" , (PUCHAR )pTxD,16 ); -DBGPRINT (RT_DEBUG_OFF , ("pTxD->DMADONE = %x\n" , pTxD->DMADONE)); - } -DBGPRINT (RT_DEBUG_OFF , ("---------------------------------------------------\n" )); -for (i=0 ;i<MGMT_RING_SIZE ;i++) - { - pTxD = (PTXD_STRUC ) pMgmtRing->Cell[i].AllocVa; -DBGPRINT (RT_DEBUG_OFF , ("Desc #%d\n" ,i)); -hex_dump ("Mgmt Descriptor" , (PUCHAR )pTxD,16 ); -DBGPRINT (RT_DEBUG_OFF , ("pMgmt->DMADONE = %x\n" , pTxD->DMADONE)); - } -DBGPRINT (RT_DEBUG_OFF , ("---------------------------------------------------\n" )); -for (i=0 ;i<RX_RING_SIZE ;i++) - { - pRxD = (PRT28XX_RXD_STRUC ) pRxRing->Cell[i].AllocVa; -DBGPRINT (RT_DEBUG_OFF , ("Desc #%d\n" ,i)); -hex_dump ("Rx Descriptor" , (PUCHAR )pRxD,16 ); -DBGPRINT (RT_DEBUG_OFF , ("pRxD->DDONE = %x\n" , pRxD->DDONE)); - } -#endif // RTMP_MAC_PCI // - -return TRUE; -} - -/* -========================================================================== -Description: -Reset statistics counter - -Arguments: -pAdapter Pointer to our adapter -arg - -Return: -TRUE if all parameters are OK, FALSE otherwise -========================================================================== -*/ -INT Set_ResetStatCounter_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -//UCHAR i; -//MAC_TABLE_ENTRY *pEntry; - -DBGPRINT (RT_DEBUG_TRACE , ("==>Set_ResetStatCounter_Proc\n" )); - -// add the most up-to-date h/w raw counters into software counters -NICUpdateRawCounters (pAd); - -NdisZeroMemory (&pAd->WlanCounters,sizeof (COUNTER_802_11 )); -NdisZeroMemory (&pAd->Counters8023,sizeof (COUNTER_802_3 )); -NdisZeroMemory (&pAd->RalinkCounters,sizeof (COUNTER_RALINK )); - -// Reset HotSpot counter - - -return TRUE; -} - -/* -======================================================================== - -Routine Description: -Add WPA key process. -In Adhoc WPANONE, bPairwise = 0; KeyIdx = 0; - -Arguments: -pAd Pointer to our adapter -pBuf Pointer to the where the key stored - -Return Value: -NDIS_SUCCESS Add key successfully - -IRQL = DISPATCH_LEVEL - -Note: - -======================================================================== -*/ - -BOOLEAN RTMPCheckStrPrintAble ( - IN CHAR *pInPutStr, - IN UCHAR strLen) -{ -UCHAR i=0 ; - -for (i=0 ; i<strLen; i++) - { -if ((pInPutStr[i] <0x21 ) || - (pInPutStr[i] >0x7E )) -return FALSE; - } - -return TRUE; -} - -/* -======================================================================== - -Routine Description: -Remove WPA Key process - -Arguments: -pAd Pointer to our adapter -pBuf Pointer to the where the key stored - -Return Value: -NDIS_SUCCESS Add key successfully - -IRQL = DISPATCH_LEVEL - -Note: - -======================================================================== -*/ -VOID RTMPSetDesiredRates ( - IN PRTMP_ADAPTER pAdapter, - IN LONG Rates) -{ -NDIS_802_11_RATES aryRates; - -memset (&aryRates,0x00 ,sizeof (NDIS_802_11_RATES )); -switch (pAdapter->CommonCfg.PhyMode) - { -case PHY_11A :// A only -switch (Rates) - { -case 6000000 ://6M - aryRates[0 ] =0x0c ;// 6M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_0 ; -break ; -case 9000000 ://9M - aryRates[0 ] =0x12 ;// 9M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_1 ; -break ; -case 12000000 ://12M - aryRates[0 ] =0x18 ;// 12M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_2 ; -break ; -case 18000000 ://18M - aryRates[0 ] =0x24 ;// 18M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_3 ; -break ; -case 24000000 ://24M - aryRates[0 ] =0x30 ;// 24M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_4 ; -break ; -case 36000000 ://36M - aryRates[0 ] =0x48 ;// 36M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_5 ; -break ; -case 48000000 ://48M - aryRates[0 ] =0x60 ;// 48M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_6 ; -break ; -case 54000000 ://54M - aryRates[0 ] =0x6c ;// 54M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_7 ; -break ; -case -1 ://Auto -default : - aryRates[0 ] =0x6c ;// 54Mbps - aryRates[1 ] =0x60 ;// 48Mbps - aryRates[2 ] =0x48 ;// 36Mbps - aryRates[3 ] =0x30 ;// 24Mbps - aryRates[4 ] =0x24 ;// 18M - aryRates[5 ] =0x18 ;// 12M - aryRates[6 ] =0x12 ;// 9M - aryRates[7 ] =0x0c ;// 6M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_AUTO ; -break ; - } -break ; -case PHY_11BG_MIXED :// B/G Mixed -case PHY_11B :// B only -case PHY_11ABG_MIXED :// A/B/G Mixed -default : -switch (Rates) - { -case 1000000 ://1M - aryRates[0 ] =0x02 ; - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_0 ; -break ; -case 2000000 ://2M - aryRates[0 ] =0x04 ; - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_1 ; -break ; -case 5000000 ://5.5M - aryRates[0 ] =0x0b ;// 5.5M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_2 ; -break ; -case 11000000 ://11M - aryRates[0 ] =0x16 ;// 11M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_3 ; -break ; -case 6000000 ://6M - aryRates[0 ] =0x0c ;// 6M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_0 ; -break ; -case 9000000 ://9M - aryRates[0 ] =0x12 ;// 9M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_1 ; -break ; -case 12000000 ://12M - aryRates[0 ] =0x18 ;// 12M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_2 ; -break ; -case 18000000 ://18M - aryRates[0 ] =0x24 ;// 18M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_3 ; -break ; -case 24000000 ://24M - aryRates[0 ] =0x30 ;// 24M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_4 ; -break ; -case 36000000 ://36M - aryRates[0 ] =0x48 ;// 36M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_5 ; -break ; -case 48000000 ://48M - aryRates[0 ] =0x60 ;// 48M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_6 ; -break ; -case 54000000 ://54M - aryRates[0 ] =0x6c ;// 54M - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_7 ; -break ; -case -1 ://Auto -default : -if (pAdapter->CommonCfg.PhyMode ==PHY_11B ) - {//B Only - aryRates[0 ] =0x16 ;// 11Mbps - aryRates[1 ] =0x0b ;// 5.5Mbps - aryRates[2 ] =0x04 ;// 2Mbps - aryRates[3 ] =0x02 ;// 1Mbps - } -else - {//(B/G) Mixed or (A/B/G) Mixed - aryRates[0 ] =0x6c ;// 54Mbps - aryRates[1 ] =0x60 ;// 48Mbps - aryRates[2 ] =0x48 ;// 36Mbps - aryRates[3 ] =0x30 ;// 24Mbps - aryRates[4 ] =0x16 ;// 11Mbps - aryRates[5 ] =0x0b ;// 5.5Mbps - aryRates[6 ] =0x04 ;// 2Mbps - aryRates[7 ] =0x02 ;// 1Mbps - } - pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_AUTO ; -break ; - } -break ; - } - -NdisZeroMemory (pAdapter->CommonCfg.DesireRate,MAX_LEN_OF_SUPPORTED_RATES ); -NdisMoveMemory (pAdapter->CommonCfg.DesireRate, &aryRates,sizeof (NDIS_802_11_RATES )); -DBGPRINT (RT_DEBUG_TRACE , (" RTMPSetDesiredRates (%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x)\n" , - pAdapter->CommonCfg.DesireRate[0 ],pAdapter->CommonCfg.DesireRate[1 ], - pAdapter->CommonCfg.DesireRate[2 ],pAdapter->CommonCfg.DesireRate[3 ], - pAdapter->CommonCfg.DesireRate[4 ],pAdapter->CommonCfg.DesireRate[5 ], - pAdapter->CommonCfg.DesireRate[6 ],pAdapter->CommonCfg.DesireRate[7 ] )); -// Changing DesiredRate may affect the MAX TX rate we used to TX frames out -MlmeUpdateTxRates (pAdapter, FALSE,0 ); -} - -NDIS_STATUS RTMPWPARemoveKeyProc ( - IN PRTMP_ADAPTER pAd, - IN PVOID pBuf) -{ -PNDIS_802_11_REMOVE_KEY pKey; -ULONG KeyIdx; -NDIS_STATUS Status =NDIS_STATUS_FAILURE ; -BOOLEAN bTxKey;// Set the key as transmit key -BOOLEAN bPairwise;// Indicate the key is pairwise key -BOOLEAN bKeyRSC;// indicate the receive SC set by KeyRSC value. -// Otherwise, it will set by the NIC. -BOOLEAN bAuthenticator;// indicate key is set by authenticator. -INT i; - -DBGPRINT (RT_DEBUG_TRACE ,("---> RTMPWPARemoveKeyProc\n" )); - - pKey = (PNDIS_802_11_REMOVE_KEY ) pBuf; - KeyIdx = pKey->KeyIndex &0xff ; -// Bit 31 of Add-key, Tx Key - bTxKey = (pKey->KeyIndex &0x80000000 ) ? TRUE : FALSE; -// Bit 30 of Add-key PairwiseKey - bPairwise = (pKey->KeyIndex &0x40000000 ) ? TRUE : FALSE; -// Bit 29 of Add-key KeyRSC - bKeyRSC = (pKey->KeyIndex &0x20000000 ) ? TRUE : FALSE; -// Bit 28 of Add-key Authenticator - bAuthenticator = (pKey->KeyIndex &0x10000000 ) ? TRUE : FALSE; - -// 1. If bTx is TRUE, return failure information -if (bTxKey == TRUE) -return (NDIS_STATUS_INVALID_DATA ); - -// 2. Check Pairwise Key -if (bPairwise) - { -// a. If BSSID is broadcast, remove all pairwise keys. -// b. If not broadcast, remove the pairwise specified by BSSID -for (i =0 ; i <SHARE_KEY_NUM ; i++) - { -if (MAC_ADDR_EQUAL (pAd->SharedKey[BSS0 ][i].BssId, pKey->BSSID)) - { -DBGPRINT (RT_DEBUG_TRACE ,("RTMPWPARemoveKeyProc(KeyIdx=%d)\n" , i)); - pAd->SharedKey[BSS0 ][i].KeyLen =0 ; - pAd->SharedKey[BSS0 ][i].CipherAlg =CIPHER_NONE ; -AsicRemoveSharedKeyEntry (pAd,BSS0 , (UCHAR )i); - Status =NDIS_STATUS_SUCCESS ; -break ; - } - } - } -// 3. Group Key -else - { -// a. If BSSID is broadcast, remove all group keys indexed -// b. If BSSID matched, delete the group key indexed. -DBGPRINT (RT_DEBUG_TRACE ,("RTMPWPARemoveKeyProc(KeyIdx=%ld)\n" , KeyIdx)); - pAd->SharedKey[BSS0 ][KeyIdx].KeyLen =0 ; - pAd->SharedKey[BSS0 ][KeyIdx].CipherAlg =CIPHER_NONE ; -AsicRemoveSharedKeyEntry (pAd,BSS0 , (UCHAR )KeyIdx); - Status =NDIS_STATUS_SUCCESS ; - } - -return (Status); -} - -/* -======================================================================== - -Routine Description: -Remove All WPA Keys - -Arguments: -pAd Pointer to our adapter - -Return Value: -None - -IRQL = DISPATCH_LEVEL - -Note: - -======================================================================== -*/ -VOID RTMPWPARemoveAllKeys ( - IN PRTMP_ADAPTER pAd) -{ - -UCHAR i; - -DBGPRINT (RT_DEBUG_TRACE ,("RTMPWPARemoveAllKeys(AuthMode=%d, WepStatus=%d)\n" , pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus)); -RTMP_CLEAR_PSFLAG (pAd, fRTMP_PS_CAN_GO_SLEEP); -// For WEP/CKIP, there is no need to remove it, since WinXP won't set it again after -// Link up. And it will be replaced if user changed it. -if (pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA) -return ; - -// For WPA-None, there is no need to remove it, since WinXP won't set it again after -// Link up. And it will be replaced if user changed it. -if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPANone) -return ; - -// set BSSID wcid entry of the Pair-wise Key table as no-security mode -AsicRemovePairwiseKeyEntry (pAd,BSS0 ,BSSID_WCID ); - -// set all shared key mode as no-security. -for (i =0 ; i <SHARE_KEY_NUM ; i++) - { -DBGPRINT (RT_DEBUG_TRACE ,("remove %s key #%d\n" , CipherName[pAd->SharedKey[BSS0 ][i].CipherAlg], i)); -NdisZeroMemory (&pAd->SharedKey[BSS0 ][i],sizeof (CIPHER_KEY )); - -AsicRemoveSharedKeyEntry (pAd,BSS0 , i); - } -RTMP_SET_PSFLAG (pAd, fRTMP_PS_CAN_GO_SLEEP); -} - - -/* -======================================================================== - -Routine Description: -As STA's BSSID is a WC too, it uses shared key table. -This function write correct unicast TX key to ASIC WCID. -And we still make a copy in our MacTab.Content[BSSID_WCID].PairwiseKey. -Caller guarantee TKIP/AES always has keyidx = 0. (pairwise key) -Caller guarantee WEP calls this function when set Txkey, default key index=0~3. - -Arguments: -pAd Pointer to our adapter -pKey Pointer to the where the key stored - -Return Value: -NDIS_SUCCESS Add key successfully - -IRQL = DISPATCH_LEVEL - -Note: - -======================================================================== -*/ -/* -======================================================================== -Routine Description: -Change NIC PHY mode. Re-association may be necessary. possible settings -include - PHY_11B, PHY_11BG_MIXED, PHY_11A, and PHY_11ABG_MIXED - -Arguments: -pAd - Pointer to our adapter -phymode - - -IRQL = PASSIVE_LEVEL -IRQL = DISPATCH_LEVEL - -======================================================================== -*/ -VOID RTMPSetPhyMode ( - IN PRTMP_ADAPTER pAd, - IN ULONG phymode) -{ -INT i; -// the selected phymode must be supported by the RF IC encoded in E2PROM - -// if no change, do nothing -/* bug fix -if (pAd->CommonCfg.PhyMode == phymode) -return; -*/ - pAd->CommonCfg.PhyMode = (UCHAR )phymode; - -DBGPRINT (RT_DEBUG_TRACE ,("RTMPSetPhyMode : PhyMode=%d, channel=%d \n" , pAd->CommonCfg.PhyMode, pAd->CommonCfg.Channel)); - -BuildChannelList (pAd); - -// sanity check user setting -for (i =0 ; i < pAd->ChannelListNum; i++) - { -if (pAd->CommonCfg.Channel == pAd->ChannelList[i].Channel) -break ; - } - -if (i == pAd->ChannelListNum) - { - pAd->CommonCfg.Channel =FirstChannel (pAd); -DBGPRINT (RT_DEBUG_ERROR , ("RTMPSetPhyMode: channel is out of range, use first channel=%d \n" , pAd->CommonCfg.Channel)); - } - -NdisZeroMemory (pAd->CommonCfg.SupRate,MAX_LEN_OF_SUPPORTED_RATES ); -NdisZeroMemory (pAd->CommonCfg.ExtRate,MAX_LEN_OF_SUPPORTED_RATES ); -NdisZeroMemory (pAd->CommonCfg.DesireRate,MAX_LEN_OF_SUPPORTED_RATES ); -switch (phymode) { -case PHY_11B : - pAd->CommonCfg.SupRate[0 ] =0x82 ;// 1 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[1 ] =0x84 ;// 2 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[2 ] =0x8B ;// 5.5 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[3 ] =0x96 ;// 11 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRateLen =4 ; - pAd->CommonCfg.ExtRateLen =0 ; - pAd->CommonCfg.DesireRate[0 ] =2 ;// 1 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[1 ] =4 ;// 2 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[2 ] =11 ;// 5.5 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[3 ] =22 ;// 11 mbps, in units of 0.5 Mbps -//pAd->CommonCfg.HTPhyMode.field.MODE = MODE_CCK; // This MODE is only FYI. not use -break ; - -case PHY_11G : -case PHY_11BG_MIXED : -case PHY_11ABG_MIXED : -case PHY_11N_2_4G : -case PHY_11ABGN_MIXED : -case PHY_11BGN_MIXED : -case PHY_11GN_MIXED : - pAd->CommonCfg.SupRate[0 ] =0x82 ;// 1 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[1 ] =0x84 ;// 2 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[2 ] =0x8B ;// 5.5 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[3 ] =0x96 ;// 11 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[4 ] =0x12 ;// 9 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[5 ] =0x24 ;// 18 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[6 ] =0x48 ;// 36 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[7 ] =0x6c ;// 54 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRateLen =8 ; - pAd->CommonCfg.ExtRate[0 ] =0x0C ;// 6 mbps, in units of 0.5 Mbps - pAd->CommonCfg.ExtRate[1 ] =0x18 ;// 12 mbps, in units of 0.5 Mbps - pAd->CommonCfg.ExtRate[2 ] =0x30 ;// 24 mbps, in units of 0.5 Mbps - pAd->CommonCfg.ExtRate[3 ] =0x60 ;// 48 mbps, in units of 0.5 Mbps - pAd->CommonCfg.ExtRateLen =4 ; - pAd->CommonCfg.DesireRate[0 ] =2 ;// 1 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[1 ] =4 ;// 2 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[2 ] =11 ;// 5.5 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[3 ] =22 ;// 11 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[4 ] =12 ;// 6 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[5 ] =18 ;// 9 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[6 ] =24 ;// 12 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[7 ] =36 ;// 18 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[8 ] =48 ;// 24 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[9 ] =72 ;// 36 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[10 ] =96 ;// 48 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[11 ] =108 ;// 54 mbps, in units of 0.5 Mbps -break ; - -case PHY_11A : -case PHY_11AN_MIXED : -case PHY_11AGN_MIXED : -case PHY_11N_5G : - pAd->CommonCfg.SupRate[0 ] =0x8C ;// 6 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[1 ] =0x12 ;// 9 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[2 ] =0x98 ;// 12 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[3 ] =0x24 ;// 18 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[4 ] =0xb0 ;// 24 mbps, in units of 0.5 Mbps, basic rate - pAd->CommonCfg.SupRate[5 ] =0x48 ;// 36 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[6 ] =0x60 ;// 48 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRate[7 ] =0x6c ;// 54 mbps, in units of 0.5 Mbps - pAd->CommonCfg.SupRateLen =8 ; - pAd->CommonCfg.ExtRateLen =0 ; - pAd->CommonCfg.DesireRate[0 ] =12 ;// 6 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[1 ] =18 ;// 9 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[2 ] =24 ;// 12 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[3 ] =36 ;// 18 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[4 ] =48 ;// 24 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[5 ] =72 ;// 36 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[6 ] =96 ;// 48 mbps, in units of 0.5 Mbps - pAd->CommonCfg.DesireRate[7 ] =108 ;// 54 mbps, in units of 0.5 Mbps -//pAd->CommonCfg.HTPhyMode.field.MODE = MODE_OFDM; // This MODE is only FYI. not use -break ; - -default : -break ; - } - - - pAd->CommonCfg.BandState =UNKNOWN_BAND ; -} - -/* -======================================================================== -Routine Description: -Caller ensures we has 802.11n support. -Calls at setting HT from AP/STASetinformation - -Arguments: -pAd - Pointer to our adapter -phymode - - -======================================================================== -*/ -VOID RTMPSetHT ( - IN PRTMP_ADAPTER pAd, - IN OID_SET_HT_PHYMODE *pHTPhyMode) -{ -//ULONG *pmcs; -UINT32 Value =0 ; -UCHAR BBPValue =0 ; -UCHAR BBP3Value =0 ; -UCHAR RxStream = pAd->CommonCfg.RxStream; - -DBGPRINT (RT_DEBUG_TRACE , ("RTMPSetHT : HT_mode(%d), ExtOffset(%d), MCS(%d), BW(%d), STBC(%d), SHORTGI(%d)\n" , - pHTPhyMode->HtMode, pHTPhyMode->ExtOffset, - pHTPhyMode->MCS, pHTPhyMode->BW, - pHTPhyMode->STBC, pHTPhyMode->SHORTGI)); - -// Don't zero supportedHyPhy structure. -RTMPZeroMemory (&pAd->CommonCfg.HtCapability,sizeof (pAd->CommonCfg.HtCapability)); -RTMPZeroMemory (&pAd->CommonCfg.AddHTInfo,sizeof (pAd->CommonCfg.AddHTInfo)); -RTMPZeroMemory (&pAd->CommonCfg.NewExtChanOffset,sizeof (pAd->CommonCfg.NewExtChanOffset)); -RTMPZeroMemory (&pAd->CommonCfg.DesiredHtPhy,sizeof (pAd->CommonCfg.DesiredHtPhy)); - -if (pAd->CommonCfg.bRdg) - { - pAd->CommonCfg.HtCapability.ExtHtCapInfo.PlusHTC =1 ; - pAd->CommonCfg.HtCapability.ExtHtCapInfo.RDGSupport =1 ; - } -else - { - pAd->CommonCfg.HtCapability.ExtHtCapInfo.PlusHTC =0 ; - pAd->CommonCfg.HtCapability.ExtHtCapInfo.RDGSupport =0 ; - } - - pAd->CommonCfg.HtCapability.HtCapParm.MaxRAmpduFactor =3 ; - pAd->CommonCfg.DesiredHtPhy.MaxRAmpduFactor =3 ; - -DBGPRINT (RT_DEBUG_TRACE , ("RTMPSetHT : RxBAWinLimit = %d\n" , pAd->CommonCfg.BACapability.field.RxBAWinLimit)); - -// Mimo power save, A-MSDU size, - pAd->CommonCfg.DesiredHtPhy.AmsduEnable = (USHORT )pAd->CommonCfg.BACapability.field.AmsduEnable; - pAd->CommonCfg.DesiredHtPhy.AmsduSize = (UCHAR )pAd->CommonCfg.BACapability.field.AmsduSize; - pAd->CommonCfg.DesiredHtPhy.MimoPs = (UCHAR )pAd->CommonCfg.BACapability.field.MMPSmode; - pAd->CommonCfg.DesiredHtPhy.MpduDensity = (UCHAR )pAd->CommonCfg.BACapability.field.MpduDensity; - - pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT )pAd->CommonCfg.BACapability.field.AmsduSize; - pAd->CommonCfg.HtCapability.HtCapInfo.MimoPs = (USHORT )pAd->CommonCfg.BACapability.field.MMPSmode; - pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR )pAd->CommonCfg.BACapability.field.MpduDensity; - -DBGPRINT (RT_DEBUG_TRACE , ("RTMPSetHT : AMsduSize = %d, MimoPs = %d, MpduDensity = %d, MaxRAmpduFactor = %d\n" , - pAd->CommonCfg.DesiredHtPhy.AmsduSize, - pAd->CommonCfg.DesiredHtPhy.MimoPs, - pAd->CommonCfg.DesiredHtPhy.MpduDensity, - pAd->CommonCfg.DesiredHtPhy.MaxRAmpduFactor)); - -if (pHTPhyMode->HtMode ==HTMODE_GF ) - { - pAd->CommonCfg.HtCapability.HtCapInfo.GF =1 ; - pAd->CommonCfg.DesiredHtPhy.GF =1 ; - } -else - pAd->CommonCfg.DesiredHtPhy.GF =0 ; - -// Decide Rx MCSSet -switch (RxStream) - { -case 1 : - pAd->CommonCfg.HtCapability.MCSSet[0 ] =0xff ; - pAd->CommonCfg.HtCapability.MCSSet[1 ] =0x00 ; -break ; - -case 2 : - pAd->CommonCfg.HtCapability.MCSSet[0 ] =0xff ; - pAd->CommonCfg.HtCapability.MCSSet[1 ] =0xff ; -break ; - -case 3 :// 3*3 - pAd->CommonCfg.HtCapability.MCSSet[0 ] =0xff ; - pAd->CommonCfg.HtCapability.MCSSet[1 ] =0xff ; - pAd->CommonCfg.HtCapability.MCSSet[2 ] =0xff ; -break ; - } - -if (pAd->CommonCfg.bForty_Mhz_Intolerant && (pAd->CommonCfg.Channel <=14 ) && (pHTPhyMode->BW ==BW_40 ) ) - { - pHTPhyMode->BW =BW_20 ; - pAd->CommonCfg.HtCapability.HtCapInfo.Forty_Mhz_Intolerant =1 ; - } - -if (pHTPhyMode->BW ==BW_40 ) - { - pAd->CommonCfg.HtCapability.MCSSet[4 ] =0x1 ;// MCS 32 - pAd->CommonCfg.HtCapability.HtCapInfo.ChannelWidth =1 ; -if (pAd->CommonCfg.Channel <=14 ) - pAd->CommonCfg.HtCapability.HtCapInfo.CCKmodein40 =1 ; - - pAd->CommonCfg.DesiredHtPhy.ChannelWidth =1 ; - pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth =1 ; - pAd->CommonCfg.AddHTInfo.AddHtInfo.ExtChanOffset = (pHTPhyMode->ExtOffset ==EXTCHA_BELOW )? (EXTCHA_BELOW ):EXTCHA_ABOVE ; -// Set Regsiter for extension channel position. -RTMP_IO_READ32 (pAd,TX_BAND_CFG , &Value); -RTMP_BBP_IO_READ8_BY_REG_ID (pAd,BBP_R3 , &BBP3Value); -if ((pHTPhyMode->ExtOffset ==EXTCHA_BELOW )) - { - Value |=0x1 ; - BBP3Value |= (0x20 ); -RTMP_IO_WRITE32 (pAd,TX_BAND_CFG , Value); - } -else if ((pHTPhyMode->ExtOffset ==EXTCHA_ABOVE )) - { - Value &=0xfe ; - BBP3Value &= (~0x20 ); -RTMP_IO_WRITE32 (pAd,TX_BAND_CFG , Value); - } - -// Turn on BBP 40MHz mode now only as AP . -// Sta can turn on BBP 40MHz after connection with 40MHz AP. Sta only broadcast 40MHz capability before connection. -if ((pAd->OpMode ==OPMODE_AP ) ||INFRA_ON (pAd) ||ADHOC_ON (pAd) - ) - { -RTMP_BBP_IO_READ8_BY_REG_ID (pAd,BBP_R4 , &BBPValue); - BBPValue &= (~0x18 ); - BBPValue |=0x10 ; -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R4 , BBPValue); - -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R3 , BBP3Value); - pAd->CommonCfg.BBPCurrentBW =BW_40 ; - } - } -else - { - pAd->CommonCfg.HtCapability.HtCapInfo.ChannelWidth =0 ; - pAd->CommonCfg.DesiredHtPhy.ChannelWidth =0 ; - pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth =0 ; - pAd->CommonCfg.AddHTInfo.AddHtInfo.ExtChanOffset =EXTCHA_NONE ; - pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel; -// Turn on BBP 20MHz mode by request here. - { -RTMP_BBP_IO_READ8_BY_REG_ID (pAd,BBP_R4 , &BBPValue); - BBPValue &= (~0x18 ); -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R4 , BBPValue); - pAd->CommonCfg.BBPCurrentBW =BW_20 ; - } - } - -if (pHTPhyMode->STBC ==STBC_USE ) - { - pAd->CommonCfg.HtCapability.HtCapInfo.TxSTBC =1 ; - pAd->CommonCfg.DesiredHtPhy.TxSTBC =1 ; - pAd->CommonCfg.HtCapability.HtCapInfo.RxSTBC =1 ; - pAd->CommonCfg.DesiredHtPhy.RxSTBC =1 ; - } -else - { - pAd->CommonCfg.DesiredHtPhy.TxSTBC =0 ; - pAd->CommonCfg.DesiredHtPhy.RxSTBC =0 ; - } - -if (pHTPhyMode->SHORTGI ==GI_400 ) - { - pAd->CommonCfg.HtCapability.HtCapInfo.ShortGIfor20 =1 ; - pAd->CommonCfg.HtCapability.HtCapInfo.ShortGIfor40 =1 ; - pAd->CommonCfg.DesiredHtPhy.ShortGIfor20 =1 ; - pAd->CommonCfg.DesiredHtPhy.ShortGIfor40 =1 ; - } -else - { - pAd->CommonCfg.HtCapability.HtCapInfo.ShortGIfor20 =0 ; - pAd->CommonCfg.HtCapability.HtCapInfo.ShortGIfor40 =0 ; - pAd->CommonCfg.DesiredHtPhy.ShortGIfor20 =0 ; - pAd->CommonCfg.DesiredHtPhy.ShortGIfor40 =0 ; - } - -// We support link adaptation for unsolicit MCS feedback, set to 2. - pAd->CommonCfg.HtCapability.ExtHtCapInfo.MCSFeedback =MCSFBK_NONE ;//MCSFBK_UNSOLICIT; - pAd->CommonCfg.AddHTInfo.ControlChan = pAd->CommonCfg.Channel; -// 1, the extension channel above the control channel. - -// EDCA parameters used for AP's own transmission -if (pAd->CommonCfg.APEdcaParm.bValid == FALSE) - { - pAd->CommonCfg.APEdcaParm.bValid = TRUE; - pAd->CommonCfg.APEdcaParm.Aifsn[0 ] =3 ; - pAd->CommonCfg.APEdcaParm.Aifsn[1 ] =7 ; - pAd->CommonCfg.APEdcaParm.Aifsn[2 ] =1 ; - pAd->CommonCfg.APEdcaParm.Aifsn[3 ] =1 ; - - pAd->CommonCfg.APEdcaParm.Cwmin[0 ] =4 ; - pAd->CommonCfg.APEdcaParm.Cwmin[1 ] =4 ; - pAd->CommonCfg.APEdcaParm.Cwmin[2 ] =3 ; - pAd->CommonCfg.APEdcaParm.Cwmin[3 ] =2 ; - - pAd->CommonCfg.APEdcaParm.Cwmax[0 ] =6 ; - pAd->CommonCfg.APEdcaParm.Cwmax[1 ] =10 ; - pAd->CommonCfg.APEdcaParm.Cwmax[2 ] =4 ; - pAd->CommonCfg.APEdcaParm.Cwmax[3 ] =3 ; - - pAd->CommonCfg.APEdcaParm.Txop[0 ] =0 ; - pAd->CommonCfg.APEdcaParm.Txop[1 ] =0 ; - pAd->CommonCfg.APEdcaParm.Txop[2 ] =94 ; - pAd->CommonCfg.APEdcaParm.Txop[3 ] =47 ; - } -AsicSetEdcaParm (pAd, &pAd->CommonCfg.APEdcaParm); - - { -RTMPSetIndividualHT (pAd,0 ); - } - -} - -/* -======================================================================== -Routine Description: -Caller ensures we has 802.11n support. -Calls at setting HT from AP/STASetinformation - -Arguments: -pAd - Pointer to our adapter -phymode - - -======================================================================== -*/ -VOID RTMPSetIndividualHT ( - IN PRTMP_ADAPTER pAd, - IN UCHAR apidx) -{ -PRT_HT_PHY_INFO pDesired_ht_phy =NULL ; -UCHAR TxStream = pAd->CommonCfg.TxStream; -UCHAR DesiredMcs =MCS_AUTO ; - -do - { - { - pDesired_ht_phy = &pAd->StaCfg.DesiredHtPhyInfo; - DesiredMcs = pAd->StaCfg.DesiredTransmitSetting.field.MCS; -//pAd->StaCfg.bAutoTxRateSwitch = (DesiredMcs == MCS_AUTO) ? TRUE : FALSE; -break ; - } - }while (FALSE); - -if (pDesired_ht_phy ==NULL ) - { -DBGPRINT (RT_DEBUG_ERROR , ("RTMPSetIndividualHT: invalid apidx(%d)\n" , apidx)); -return ; - } -RTMPZeroMemory (pDesired_ht_phy,sizeof (RT_HT_PHY_INFO )); - -DBGPRINT (RT_DEBUG_TRACE , ("RTMPSetIndividualHT : Desired MCS = %d\n" , DesiredMcs)); -// Check the validity of MCS -if ((TxStream ==1 ) && ((DesiredMcs >=MCS_8 ) && (DesiredMcs <=MCS_15 ))) - { -DBGPRINT (RT_DEBUG_WARN , ("RTMPSetIndividualHT: MCS(%d) is invalid in 1S, reset it as MCS_7\n" , DesiredMcs)); - DesiredMcs =MCS_7 ; - } - -if ((pAd->CommonCfg.DesiredHtPhy.ChannelWidth ==BW_20 ) && (DesiredMcs ==MCS_32 )) - { -DBGPRINT (RT_DEBUG_WARN , ("RTMPSetIndividualHT: MCS_32 is only supported in 40-MHz, reset it as MCS_0\n" )); - DesiredMcs =MCS_0 ; - } - - pDesired_ht_phy->bHtEnable = TRUE; - -// Decide desired Tx MCS -switch (TxStream) - { -case 1 : -if (DesiredMcs ==MCS_AUTO ) - { - pDesired_ht_phy->MCSSet[0 ]=0xff ; - pDesired_ht_phy->MCSSet[1 ]=0x00 ; - } -else if (DesiredMcs <=MCS_7 ) - { - pDesired_ht_phy->MCSSet[0 ]=1 <<DesiredMcs; - pDesired_ht_phy->MCSSet[1 ]=0x00 ; - } -break ; - -case 2 : -if (DesiredMcs ==MCS_AUTO ) - { - pDesired_ht_phy->MCSSet[0 ]=0xff ; - pDesired_ht_phy->MCSSet[1 ]=0xff ; - } -else if (DesiredMcs <=MCS_15 ) - { -ULONG mode; - - mode = DesiredMcs /8 ; -if (mode <2 ) - pDesired_ht_phy->MCSSet[mode] = (1 << (DesiredMcs - mode *8 )); - } -break ; - -case 3 :// 3*3 -if (DesiredMcs ==MCS_AUTO ) - { -/* MCS0 ~ MCS23, 3 bytes */ - pDesired_ht_phy->MCSSet[0 ]=0xff ; - pDesired_ht_phy->MCSSet[1 ]=0xff ; - pDesired_ht_phy->MCSSet[2 ]=0xff ; - } -else if (DesiredMcs <=MCS_23 ) - { -ULONG mode; - - mode = DesiredMcs /8 ; -if (mode <3 ) - pDesired_ht_phy->MCSSet[mode] = (1 << (DesiredMcs - mode *8 )); - } -break ; - } - -if (pAd->CommonCfg.DesiredHtPhy.ChannelWidth ==BW_40 ) - { -if (DesiredMcs ==MCS_AUTO || DesiredMcs ==MCS_32 ) - pDesired_ht_phy->MCSSet[4 ] =0x1 ; - } - -// update HT Rate setting -if (pAd->OpMode ==OPMODE_STA ) -MlmeUpdateHtTxRates (pAd,BSS0 ); -else -MlmeUpdateHtTxRates (pAd, apidx); -} - - -/* -======================================================================== -Routine Description: -Update HT IE from our capability. - -Arguments: -Send all HT IE in beacon/probe rsp/assoc rsp/action frame. - - -======================================================================== -*/ -VOID RTMPUpdateHTIE ( - IN RT_HT_CAPABILITY *pRtHt, - IN UCHAR *pMcsSet, - OUT HT_CAPABILITY_IE *pHtCapability, - OUT ADD_HT_INFO_IE *pAddHtInfo) -{ -RTMPZeroMemory (pHtCapability,sizeof (HT_CAPABILITY_IE )); -RTMPZeroMemory (pAddHtInfo,sizeof (ADD_HT_INFO_IE )); - - pHtCapability->HtCapInfo.ChannelWidth = pRtHt->ChannelWidth; - pHtCapability->HtCapInfo.MimoPs = pRtHt->MimoPs; - pHtCapability->HtCapInfo.GF = pRtHt->GF; - pHtCapability->HtCapInfo.ShortGIfor20 = pRtHt->ShortGIfor20; - pHtCapability->HtCapInfo.ShortGIfor40 = pRtHt->ShortGIfor40; - pHtCapability->HtCapInfo.TxSTBC = pRtHt->TxSTBC; - pHtCapability->HtCapInfo.RxSTBC = pRtHt->RxSTBC; - pHtCapability->HtCapInfo.AMsduSize = pRtHt->AmsduSize; - pHtCapability->HtCapParm.MaxRAmpduFactor = pRtHt->MaxRAmpduFactor; - pHtCapability->HtCapParm.MpduDensity = pRtHt->MpduDensity; - - pAddHtInfo->AddHtInfo.ExtChanOffset = pRtHt->ExtChanOffset ; - pAddHtInfo->AddHtInfo.RecomWidth = pRtHt->RecomWidth; - pAddHtInfo->AddHtInfo2.OperaionMode = pRtHt->OperaionMode; - pAddHtInfo->AddHtInfo2.NonGfPresent = pRtHt->NonGfPresent; -RTMPMoveMemory (pAddHtInfo->MCSSet,/*pRtHt->MCSSet*/ pMcsSet,4 );// rt2860 only support MCS max=32, no need to copy all 16 uchar. - -DBGPRINT (RT_DEBUG_TRACE ,("RTMPUpdateHTIE <== \n" )); -} - -/* -======================================================================== -Description: -Add Client security information into ASIC WCID table and IVEIV table. -Return: -======================================================================== -*/ -VOID RTMPAddWcidAttributeEntry ( - IN PRTMP_ADAPTER pAd, - IN UCHAR BssIdx, - IN UCHAR KeyIdx, - IN UCHAR CipherAlg, - IN MAC_TABLE_ENTRY *pEntry) -{ -UINT32 WCIDAttri =0 ; -USHORT offset; -UCHAR IVEIV =0 ; -USHORT Wcid =0 ; - - { - { -if (BssIdx >BSS0 ) - { -DBGPRINT (RT_DEBUG_ERROR , ("RTMPAddWcidAttributeEntry: The BSS-index(%d) is out of range for Infra link. \n" , BssIdx)); -return ; - } - -// 1. In ADHOC mode, the AID is wcid number. And NO mesh link exists. -// 2. In Infra mode, the AID:1 MUST be wcid of infra STA. -// the AID:2~ assign to mesh link entry. -if (pEntry) - Wcid = pEntry->Aid; -else - Wcid =MCAST_WCID ; - } - } - -// Update WCID attribute table - offset =MAC_WCID_ATTRIBUTE_BASE + (Wcid *HW_WCID_ATTRI_SIZE ); - - { -if (pEntry && pEntry->ValidAsMesh) - WCIDAttri = (CipherAlg<<1 ) |PAIRWISEKEYTABLE ; -else - WCIDAttri = (CipherAlg<<1 ) |SHAREDKEYTABLE ; - } - -RTMP_IO_WRITE32 (pAd, offset, WCIDAttri); - - -// Update IV/EIV table - offset =MAC_IVEIV_TABLE_BASE + (Wcid *HW_IVEIV_ENTRY_SIZE ); - -// WPA mode -if ((CipherAlg ==CIPHER_TKIP ) || (CipherAlg ==CIPHER_TKIP_NO_MIC ) || (CipherAlg ==CIPHER_AES )) - { -// Eiv bit on. keyid always is 0 for pairwise key -IVEIV = (KeyIdx <<6 ) |0x20 ; - } -else - { -// WEP KeyIdx is default tx key. -IVEIV = (KeyIdx <<6 ); - } - -// For key index and ext IV bit, so only need to update the position(offset+3). -#ifdef RTMP_MAC_PCI -RTMP_IO_WRITE8 (pAd, offset+3 ,IVEIV ); -#endif // RTMP_MAC_PCI // -#ifdef RTMP_MAC_USB -RTUSBMultiWrite_OneByte (pAd, offset+3 , &IVEIV ); -#endif // RTMP_MAC_USB // - -DBGPRINT (RT_DEBUG_TRACE ,("RTMPAddWcidAttributeEntry: WCID #%d, KeyIndex #%d, Alg=%s\n" ,Wcid, KeyIdx, CipherName[CipherAlg])); -DBGPRINT (RT_DEBUG_TRACE ,(" WCIDAttri = 0x%x \n" , WCIDAttri)); - -} - -/* -========================================================================== -Description: -Parse encryption type -Arguments: -pAdapter Pointer to our adapter -wrq Pointer to the ioctl argument - -Return Value: -None - -Note: -========================================================================== -*/ -PSTRING GetEncryptType (CHAR enc) -{ -if (enc == Ndis802_11WEPDisabled) -return "NONE" ; -if (enc == Ndis802_11WEPEnabled) -return "WEP" ; -if (enc == Ndis802_11Encryption2Enabled) -return "TKIP" ; -if (enc == Ndis802_11Encryption3Enabled) -return "AES" ; -if (enc == Ndis802_11Encryption4Enabled) -return "TKIPAES" ; -else -return "UNKNOW" ; -} - -PSTRING GetAuthMode (CHAR auth) -{ -if (auth == Ndis802_11AuthModeOpen) -return "OPEN" ; -if (auth == Ndis802_11AuthModeShared) -return "SHARED" ; -if (auth == Ndis802_11AuthModeAutoSwitch) -return "AUTOWEP" ; -if (auth == Ndis802_11AuthModeWPA) -return "WPA" ; -if (auth == Ndis802_11AuthModeWPAPSK) -return "WPAPSK" ; -if (auth == Ndis802_11AuthModeWPANone) -return "WPANONE" ; -if (auth == Ndis802_11AuthModeWPA2) -return "WPA2" ; -if (auth == Ndis802_11AuthModeWPA2PSK) -return "WPA2PSK" ; -if (auth == Ndis802_11AuthModeWPA1WPA2) -return "WPA1WPA2" ; -if (auth == Ndis802_11AuthModeWPA1PSKWPA2PSK) -return "WPA1PSKWPA2PSK" ; - -return "UNKNOW" ; -} - -/* -========================================================================== -Description: -Get site survey results -Arguments: -pAdapter Pointer to our adapter -wrq Pointer to the ioctl argument - -Return Value: -None - -Note: -Usage: -1.) UI needs to wait 4 seconds after issue a site survey command -2.) iwpriv ra0 get_site_survey -3.) UI needs to prepare at least 4096bytes to get the results -========================================================================== -*/ -#define LINE_LEN (4+33+20+23+9+7+7+3) // Channel+SSID+Bssid+Security+Signal+WiressMode+ExtCh+NetworkType -VOID RTMPCommSiteSurveyData ( - IN PSTRING msg, - IN PBSS_ENTRY pBss) -{ -INT Rssi =0 ; -UINT Rssi_Quality =0 ; -NDIS_802_11_NETWORK_TYPE wireless_mode; -CHAR Ssid[MAX_LEN_OF_SSID +1 ]; -STRING SecurityStr[32 ] = {0 }; -NDIS_802_11_ENCRYPTION_STATUS ap_cipher = Ndis802_11EncryptionDisabled; -NDIS_802_11_AUTHENTICATION_MODE ap_auth_mode = Ndis802_11AuthModeOpen; - -memset (Ssid,0 ,(MAX_LEN_OF_SSID +1 )); - -//Channel -sprintf (msg+strlen (msg),"%-4d" , pBss->Channel); -//SSID -memcpy (Ssid, pBss->Ssid, pBss->SsidLen); - Ssid[pBss->SsidLen] ='\0' ; -sprintf (msg+strlen (msg),"%-33s" , Ssid); -//BSSID -sprintf (msg+strlen (msg),"%02x:%02x:%02x:%02x:%02x:%02x " , - pBss->Bssid[0 ], - pBss->Bssid[1 ], - pBss->Bssid[2 ], - pBss->Bssid[3 ], - pBss->Bssid[4 ], - pBss->Bssid[5 ]); - -//Security -if ((Ndis802_11AuthModeWPA <= pBss->AuthMode) && - (pBss->AuthMode <= Ndis802_11AuthModeWPA1PSKWPA2PSK)) - { -if (pBss->AuthModeAux == Ndis802_11AuthModeWPANone) - { - ap_auth_mode = pBss->AuthMode; -if (pBss->WPA.PairCipherAux == Ndis802_11WEPDisabled) - ap_cipher = pBss->WPA.PairCipher; -else - ap_cipher = Ndis802_11Encryption4Enabled; - } -else if (pBss->AuthModeAux == Ndis802_11AuthModeOpen) - { - ap_auth_mode = pBss->AuthMode; -if ((ap_auth_mode == Ndis802_11AuthModeWPA) || - (ap_auth_mode == Ndis802_11AuthModeWPAPSK)) - { -if (pBss->WPA.PairCipherAux == Ndis802_11WEPDisabled) - ap_cipher = pBss->WPA.PairCipher; -else - ap_cipher = Ndis802_11Encryption4Enabled; - } -else if ((ap_auth_mode == Ndis802_11AuthModeWPA2) || - (ap_auth_mode == Ndis802_11AuthModeWPA2PSK)) - { -if (pBss->WPA2.PairCipherAux == Ndis802_11WEPDisabled) - ap_cipher = pBss->WPA2.PairCipher; -else - ap_cipher = Ndis802_11Encryption4Enabled; - } - } -else if ((pBss->AuthMode == Ndis802_11AuthModeWPAPSK) || - (pBss->AuthMode == Ndis802_11AuthModeWPA2PSK)) - { -if ((pBss->AuthModeAux == Ndis802_11AuthModeWPAPSK) || - (pBss->AuthModeAux == Ndis802_11AuthModeWPA2PSK)) - ap_auth_mode = Ndis802_11AuthModeWPA1PSKWPA2PSK; -else - ap_auth_mode = pBss->AuthMode; - -if (pBss->WPA.PairCipher != pBss->WPA2.PairCipher) - ap_cipher = Ndis802_11Encryption4Enabled; -else if ((pBss->WPA.PairCipher == pBss->WPA2.PairCipher) && - (pBss->WPA.PairCipherAux != pBss->WPA2.PairCipherAux)) - ap_cipher = Ndis802_11Encryption4Enabled; -else if ((pBss->WPA.PairCipher == pBss->WPA2.PairCipher) && - (pBss->WPA.PairCipherAux == pBss->WPA2.PairCipherAux) && - (pBss->WPA.PairCipherAux != Ndis802_11WEPDisabled)) - ap_cipher = Ndis802_11Encryption4Enabled; -else if ((pBss->WPA.PairCipher == pBss->WPA2.PairCipher) && - (pBss->WPA.PairCipherAux == pBss->WPA2.PairCipherAux) && - (pBss->WPA.PairCipherAux == Ndis802_11WEPDisabled)) - ap_cipher = pBss->WPA.PairCipher; - } -else if ((pBss->AuthMode == Ndis802_11AuthModeWPA) || - (pBss->AuthMode == Ndis802_11AuthModeWPA2)) - { -if ((pBss->AuthModeAux == Ndis802_11AuthModeWPA) || - (pBss->AuthMode == Ndis802_11AuthModeWPA2)) - ap_auth_mode = Ndis802_11AuthModeWPA1WPA2; -else - ap_auth_mode = pBss->AuthMode; - -if (pBss->WPA.PairCipher != pBss->WPA2.PairCipher) - ap_cipher = Ndis802_11Encryption4Enabled; -else if ((pBss->WPA.PairCipher == pBss->WPA2.PairCipher) && - (pBss->WPA.PairCipherAux != pBss->WPA2.PairCipherAux)) - ap_cipher = Ndis802_11Encryption4Enabled; -else if ((pBss->WPA.PairCipher == pBss->WPA2.PairCipher) && - (pBss->WPA.PairCipherAux == pBss->WPA2.PairCipherAux) && - (pBss->WPA.PairCipherAux != Ndis802_11WEPDisabled)) - ap_cipher = Ndis802_11Encryption4Enabled; -else if ((pBss->WPA.PairCipher == pBss->WPA2.PairCipher) && - (pBss->WPA.PairCipherAux == pBss->WPA2.PairCipherAux) && - (pBss->WPA.PairCipherAux == Ndis802_11WEPDisabled)) - ap_cipher = pBss->WPA.PairCipher; - } - -sprintf (SecurityStr,"%s/%s" ,GetAuthMode ((CHAR )ap_auth_mode),GetEncryptType ((CHAR )ap_cipher)); - } -else - { - ap_auth_mode = pBss->AuthMode; - ap_cipher = pBss->WepStatus; -if (ap_cipher == Ndis802_11WEPDisabled) -sprintf (SecurityStr,"NONE" ); -else if (ap_cipher == Ndis802_11WEPEnabled) -sprintf (SecurityStr,"WEP" ); -else -sprintf (SecurityStr,"%s/%s" ,GetAuthMode ((CHAR )ap_auth_mode),GetEncryptType ((CHAR )ap_cipher)); - } - -sprintf (msg+strlen (msg),"%-23s" , SecurityStr); - -// Rssi - Rssi = (INT )pBss->Rssi; -if (Rssi >=-50 ) - Rssi_Quality =100 ; -else if (Rssi >=-80 )// between -50 ~ -80dbm - Rssi_Quality = (UINT )(24 + ((Rssi +80 ) *26 )/10 ); -else if (Rssi >=-90 )// between -80 ~ -90dbm - Rssi_Quality = (UINT )(((Rssi +90 ) *26 )/10 ); -else // < -84 dbm - Rssi_Quality =0 ; -sprintf (msg+strlen (msg),"%-9d" , Rssi_Quality); -// Wireless Mode - wireless_mode =NetworkTypeInUseSanity (pBss); -if (wireless_mode == Ndis802_11FH || - wireless_mode == Ndis802_11DS) -sprintf (msg+strlen (msg),"%-7s" ,"11b" ); -else if (wireless_mode == Ndis802_11OFDM5) -sprintf (msg+strlen (msg),"%-7s" ,"11a" ); -else if (wireless_mode == Ndis802_11OFDM5_N) -sprintf (msg+strlen (msg),"%-7s" ,"11a/n" ); -else if (wireless_mode == Ndis802_11OFDM24) -sprintf (msg+strlen (msg),"%-7s" ,"11b/g" ); -else if (wireless_mode == Ndis802_11OFDM24_N) -sprintf (msg+strlen (msg),"%-7s" ,"11b/g/n" ); -else -sprintf (msg+strlen (msg),"%-7s" ,"unknow" ); - -// Ext Channel -if (pBss->AddHtInfoLen >0 ) - { -if (pBss->AddHtInfo.AddHtInfo.ExtChanOffset ==EXTCHA_ABOVE ) -sprintf (msg+strlen (msg),"%-7s" ," ABOVE" ); -else if (pBss->AddHtInfo.AddHtInfo.ExtChanOffset ==EXTCHA_BELOW ) -sprintf (msg+strlen (msg),"%-7s" ," BELOW" ); -else -sprintf (msg+strlen (msg),"%-7s" ," NONE" ); - } -else - { -sprintf (msg+strlen (msg),"%-7s" ," NONE" ); - } - -//Network Type -if (pBss->BssType ==BSS_ADHOC ) -sprintf (msg+strlen (msg),"%-3s" ," Ad" ); -else -sprintf (msg+strlen (msg),"%-3s" ," In" ); - -sprintf (msg+strlen (msg),"\n" ); - -return ; -} - -#define MAC_LINE_LEN (14+4+4+10+10+10+6+6) // Addr+aid+psm+datatime+rxbyte+txbyte+current tx rate+last tx rate -VOID RTMPIoctlGetMacTable ( - IN PRTMP_ADAPTER pAd, - IN struct iwreq *wrq) -{ -INT i; -RT_802_11_MAC_TABLE MacTab; -char *msg; - - MacTab.Num =0 ; -for (i=0 ; i<MAX_LEN_OF_MAC_TABLE ; i++) - { -if (pAd->MacTab.Content[i].ValidAsCLI && (pAd->MacTab.Content[i].Sst ==SST_ASSOC )) - { -COPY_MAC_ADDR (MacTab.Entry[MacTab.Num].Addr, &pAd->MacTab.Content[i].Addr); - MacTab.Entry[MacTab.Num].Aid = (UCHAR )pAd->MacTab.Content[i].Aid; - MacTab.Entry[MacTab.Num].Psm = pAd->MacTab.Content[i].PsMode; - MacTab.Entry[MacTab.Num].MimoPs = pAd->MacTab.Content[i].MmpsMode; - -// Fill in RSSI per entry - MacTab.Entry[MacTab.Num].AvgRssi0 = pAd->MacTab.Content[i].RssiSample.AvgRssi0; - MacTab.Entry[MacTab.Num].AvgRssi1 = pAd->MacTab.Content[i].RssiSample.AvgRssi1; - MacTab.Entry[MacTab.Num].AvgRssi2 = pAd->MacTab.Content[i].RssiSample.AvgRssi2; - -// the connected time per entry - MacTab.Entry[MacTab.Num].ConnectedTime = pAd->MacTab.Content[i].StaConnectTime; - MacTab.Entry[MacTab.Num].TxRate.field.MCS = pAd->MacTab.Content[i].HTPhyMode.field.MCS; - MacTab.Entry[MacTab.Num].TxRate.field.BW = pAd->MacTab.Content[i].HTPhyMode.field.BW; - MacTab.Entry[MacTab.Num].TxRate.field.ShortGI = pAd->MacTab.Content[i].HTPhyMode.field.ShortGI; - MacTab.Entry[MacTab.Num].TxRate.field.STBC = pAd->MacTab.Content[i].HTPhyMode.field.STBC; - MacTab.Entry[MacTab.Num].TxRate.field.rsv = pAd->MacTab.Content[i].HTPhyMode.field.rsv; - MacTab.Entry[MacTab.Num].TxRate.field.MODE = pAd->MacTab.Content[i].HTPhyMode.field.MODE; - MacTab.Entry[MacTab.Num].TxRate.word = pAd->MacTab.Content[i].HTPhyMode.word; - - MacTab.Num +=1 ; - } - } - wrq->u.data.length =sizeof (RT_802_11_MAC_TABLE ); -if (copy_to_user (wrq->u.data.pointer, &MacTab, wrq->u.data.length)) - { -DBGPRINT (RT_DEBUG_TRACE , ("%s: copy_to_user() fail\n" , __func__)); - } - - msg =kmalloc (sizeof (CHAR )*(MAX_LEN_OF_MAC_TABLE *MAC_LINE_LEN ),MEM_ALLOC_FLAG ); -if (msg ==NULL ) - { -DBGPRINT (RT_DEBUG_ERROR , ("%s():Alloc memory failed\n" , __func__)); -return ; - } -memset (msg,0 ,MAX_LEN_OF_MAC_TABLE *MAC_LINE_LEN ); -sprintf (msg,"%s" ,"\n" ); -sprintf (msg+strlen (msg),"%-14s%-4s%-4s%-10s%-10s%-10s%-6s%-6s\n" , -"MAC" ,"AID" ,"PSM" ,"LDT" ,"RxB" ,"TxB" ,"CTxR" ,"LTxR" ); - -for (i=0 ; i<MAX_LEN_OF_MAC_TABLE ; i++) - { -PMAC_TABLE_ENTRY pEntry = &pAd->MacTab.Content[i]; -if (pEntry->ValidAsCLI && (pEntry->Sst ==SST_ASSOC )) - { -if ((strlen (msg)+MAC_LINE_LEN ) >= (MAX_LEN_OF_MAC_TABLE *MAC_LINE_LEN ) ) -break ; -sprintf (msg+strlen (msg),"%02x%02x%02x%02x%02x%02x " , - pEntry->Addr[0 ], pEntry->Addr[1 ], pEntry->Addr[2 ], - pEntry->Addr[3 ], pEntry->Addr[4 ], pEntry->Addr[5 ]); -sprintf (msg+strlen (msg),"%-4d" , (int )pEntry->Aid); -sprintf (msg+strlen (msg),"%-4d" , (int )pEntry->PsMode); -sprintf (msg+strlen (msg),"%-10d" ,0 /*pAd->MacTab.Content[i].HSCounter.LastDataPacketTime*/ );// ToDo -sprintf (msg+strlen (msg),"%-10d" ,0 /*pAd->MacTab.Content[i].HSCounter.TotalRxByteCount*/ );// ToDo -sprintf (msg+strlen (msg),"%-10d" ,0 /*pAd->MacTab.Content[i].HSCounter.TotalTxByteCount*/ );// ToDo -sprintf (msg+strlen (msg),"%-6d" ,RateIdToMbps[pAd->MacTab.Content[i].CurrTxRate]); -sprintf (msg+strlen (msg),"%-6d\n" ,0 /*RateIdToMbps[pAd->MacTab.Content[i].LastTxRate]*/ );// ToDo - } - } -// for compatible with old API just do the printk to console -//wrq->u.data.length = strlen(msg); -//if (copy_to_user(wrq->u.data.pointer, msg, wrq->u.data.length)) - { -DBGPRINT (RT_DEBUG_TRACE , ("%s" , msg)); - } - -kfree (msg); -} - - -INT Set_BASetup_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UCHAR mac[6 ], tid; -PSTRING token; -STRING sepValue[] =":" ,DASH ='-' ; -INT i; -MAC_TABLE_ENTRY *pEntry; - -/* -The BASetup inupt string format should be xx:xx:xx:xx:xx:xx-d, -=>The six 2 digit hex-decimal number previous are the Mac address, -=>The seventh decimal number is the tid value. -*/ -//DBGPRINT(RT_DEBUG_TRACE,("\n%s\n", arg)); - -if (strlen (arg) <19 )//Mac address acceptable format 01:02:03:04:05:06 length 17 plus the "-" and tid value in decimal format. -return FALSE; - - token =strchr (arg,DASH ); -if ((token !=NULL ) && (strlen (token)>1 )) - { - tid = (UCHAR )simple_strtol ((token+1 ),0 ,10 ); -if (tid >15 ) -return FALSE; - - *token ='\0' ; -for (i =0 , token =rstrtok (arg, &sepValue[0 ]); token; token =rstrtok (NULL , &sepValue[0 ]), i++) - { -if ((strlen (token) !=2 ) || (!isxdigit (*token)) || (!isxdigit (*(token+1 )))) -return FALSE; -AtoH (token, (&mac[i]),1 ); - } -if (i !=6 ) -return FALSE; - -DBGPRINT (RT_DEBUG_OFF , ("\n%02x:%02x:%02x:%02x:%02x:%02x-%02x\n" , - mac[0 ], mac[1 ], mac[2 ], mac[3 ], mac[4 ], mac[5 ], tid)); - - pEntry =MacTableLookup (pAd, (PUCHAR ) mac); - -if (pEntry) { -DBGPRINT (RT_DEBUG_OFF , ("\nSetup BA Session: Tid = %d\n" , tid)); -BAOriSessionSetUp (pAd, pEntry, tid,0 ,100 , TRUE); - } - -return TRUE; - } - -return FALSE; - -} - -INT Set_BADecline_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG bBADecline; - - bBADecline =simple_strtol (arg,0 ,10 ); - -if (bBADecline ==0 ) - { - pAd->CommonCfg.bBADecline = FALSE; - } -else if (bBADecline ==1 ) - { - pAd->CommonCfg.bBADecline = TRUE; - } -else - { -return FALSE;//Invalid argument - } - -DBGPRINT (RT_DEBUG_TRACE , ("Set_BADecline_Proc::(BADecline=%d)\n" , pAd->CommonCfg.bBADecline)); - -return TRUE; -} - -INT Set_BAOriTearDown_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UCHAR mac[6 ], tid; -PSTRING token; -STRING sepValue[] =":" ,DASH ='-' ; -INT i; -MAC_TABLE_ENTRY *pEntry; - -//DBGPRINT(RT_DEBUG_TRACE,("\n%s\n", arg)); -/* -The BAOriTearDown inupt string format should be xx:xx:xx:xx:xx:xx-d, -=>The six 2 digit hex-decimal number previous are the Mac address, -=>The seventh decimal number is the tid value. -*/ -if (strlen (arg) <19 )//Mac address acceptable format 01:02:03:04:05:06 length 17 plus the "-" and tid value in decimal format. -return FALSE; - - token =strchr (arg,DASH ); -if ((token !=NULL ) && (strlen (token)>1 )) - { - tid =simple_strtol ((token+1 ),0 ,10 ); -if (tid >NUM_OF_TID ) -return FALSE; - - *token ='\0' ; -for (i =0 , token =rstrtok (arg, &sepValue[0 ]); token; token =rstrtok (NULL , &sepValue[0 ]), i++) - { -if ((strlen (token) !=2 ) || (!isxdigit (*token)) || (!isxdigit (*(token+1 )))) -return FALSE; -AtoH (token, (&mac[i]),1 ); - } -if (i !=6 ) -return FALSE; - -DBGPRINT (RT_DEBUG_OFF , ("\n%02x:%02x:%02x:%02x:%02x:%02x-%02x" , - mac[0 ], mac[1 ], mac[2 ], mac[3 ], mac[4 ], mac[5 ], tid)); - - pEntry =MacTableLookup (pAd, (PUCHAR ) mac); - -if (pEntry) { -DBGPRINT (RT_DEBUG_OFF , ("\nTear down Ori BA Session: Tid = %d\n" , tid)); -BAOriSessionTearDown (pAd, pEntry->Aid, tid, FALSE, TRUE); - } - -return TRUE; - } - -return FALSE; - -} - -INT Set_BARecTearDown_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UCHAR mac[6 ], tid; -PSTRING token; -STRING sepValue[] =":" ,DASH ='-' ; -INT i; -MAC_TABLE_ENTRY *pEntry; - -//DBGPRINT(RT_DEBUG_TRACE,("\n%s\n", arg)); -/* -The BARecTearDown inupt string format should be xx:xx:xx:xx:xx:xx-d, -=>The six 2 digit hex-decimal number previous are the Mac address, -=>The seventh decimal number is the tid value. -*/ -if (strlen (arg) <19 )//Mac address acceptable format 01:02:03:04:05:06 length 17 plus the "-" and tid value in decimal format. -return FALSE; - - token =strchr (arg,DASH ); -if ((token !=NULL ) && (strlen (token)>1 )) - { - tid =simple_strtol ((token+1 ),0 ,10 ); -if (tid >NUM_OF_TID ) -return FALSE; - - *token ='\0' ; -for (i =0 , token =rstrtok (arg, &sepValue[0 ]); token; token =rstrtok (NULL , &sepValue[0 ]), i++) - { -if ((strlen (token) !=2 ) || (!isxdigit (*token)) || (!isxdigit (*(token+1 )))) -return FALSE; -AtoH (token, (&mac[i]),1 ); - } -if (i !=6 ) -return FALSE; - -DBGPRINT (RT_DEBUG_OFF , ("\n%02x:%02x:%02x:%02x:%02x:%02x-%02x" , - mac[0 ], mac[1 ], mac[2 ], mac[3 ], mac[4 ], mac[5 ], tid)); - - pEntry =MacTableLookup (pAd, (PUCHAR ) mac); - -if (pEntry) { -DBGPRINT (RT_DEBUG_OFF , ("\nTear down Rec BA Session: Tid = %d\n" , tid)); -BARecSessionTearDown (pAd, pEntry->Aid, tid, FALSE); - } - -return TRUE; - } - -return FALSE; - -} - -INT Set_HtBw_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG HtBw; - - HtBw =simple_strtol (arg,0 ,10 ); -if (HtBw ==BW_40 ) - pAd->CommonCfg.RegTransmitSetting.field.BW =BW_40 ; -else if (HtBw ==BW_20 ) - pAd->CommonCfg.RegTransmitSetting.field.BW =BW_20 ; -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtBw_Proc::(HtBw=%d)\n" , pAd->CommonCfg.RegTransmitSetting.field.BW)); - -return TRUE; -} - -INT Set_HtMcs_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG HtMcs, Mcs_tmp; -BOOLEAN bAutoRate = FALSE; - - Mcs_tmp =simple_strtol (arg,0 ,10 ); - -if (Mcs_tmp <=15 || Mcs_tmp ==32 ) - HtMcs = Mcs_tmp; -else - HtMcs =MCS_AUTO ; - - { - pAd->StaCfg.DesiredTransmitSetting.field.MCS = HtMcs; - pAd->StaCfg.bAutoTxRateSwitch = (HtMcs ==MCS_AUTO ) ? TRUE:FALSE; -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtMcs_Proc::(HtMcs=%d, bAutoTxRateSwitch = %d)\n" , - pAd->StaCfg.DesiredTransmitSetting.field.MCS, pAd->StaCfg.bAutoTxRateSwitch)); - -if ((pAd->CommonCfg.PhyMode <PHY_11ABGN_MIXED ) || - (pAd->MacTab.Content[BSSID_WCID ].HTPhyMode.field.MODE <MODE_HTMIX )) - { -if ((pAd->StaCfg.DesiredTransmitSetting.field.MCS !=MCS_AUTO ) && - (HtMcs >=0 && HtMcs <=3 ) && - (pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode ==FIXED_TXMODE_CCK )) - { -RTMPSetDesiredRates (pAd, (LONG ) (RateIdToMbps[HtMcs] *1000000 )); - } -else if ((pAd->StaCfg.DesiredTransmitSetting.field.MCS !=MCS_AUTO ) && - (HtMcs >=0 && HtMcs <=7 ) && - (pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode ==FIXED_TXMODE_OFDM )) - { -RTMPSetDesiredRates (pAd, (LONG ) (RateIdToMbps[HtMcs+4 ] *1000000 )); - } -else - bAutoRate = TRUE; - -if (bAutoRate) - { - pAd->StaCfg.DesiredTransmitSetting.field.MCS =MCS_AUTO ; -RTMPSetDesiredRates (pAd,-1 ); - } -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtMcs_Proc::(FixedTxMode=%d)\n" ,pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode)); - } -if (ADHOC_ON (pAd)) -return TRUE; - } - -SetCommonHT (pAd); - -return TRUE; -} - -INT Set_HtGi_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG HtGi; - - HtGi =simple_strtol (arg,0 ,10 ); - -if ( HtGi ==GI_400 ) - pAd->CommonCfg.RegTransmitSetting.field.ShortGI =GI_400 ; -else if ( HtGi ==GI_800 ) - pAd->CommonCfg.RegTransmitSetting.field.ShortGI =GI_800 ; -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtGi_Proc::(ShortGI=%d)\n" ,pAd->CommonCfg.RegTransmitSetting.field.ShortGI)); - -return TRUE; -} - - -INT Set_HtTxBASize_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UCHAR Size; - - Size =simple_strtol (arg,0 ,10 ); - -if (Size <=0 || Size >=64 ) - { - Size =8 ; - } - pAd->CommonCfg.TxBASize = Size-1 ; -DBGPRINT (RT_DEBUG_ERROR , ("Set_HtTxBASize ::(TxBASize= %d)\n" , Size)); - -return TRUE; -} - -INT Set_HtDisallowTKIP_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - -if (Value ==1 ) - { - pAd->CommonCfg.HT_DisallowTKIP = TRUE; - } -else - { - pAd->CommonCfg.HT_DisallowTKIP = FALSE; - } - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtDisallowTKIP_Proc ::%s\n" , - (pAd->CommonCfg.HT_DisallowTKIP == TRUE) ?"enabled" :"disabled" )); - -return TRUE; -} - -INT Set_HtOpMode_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ - -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - -if (Value ==HTMODE_GF ) - pAd->CommonCfg.RegTransmitSetting.field.HTMODE =HTMODE_GF ; -else if ( Value ==HTMODE_MM ) - pAd->CommonCfg.RegTransmitSetting.field.HTMODE =HTMODE_MM ; -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtOpMode_Proc::(HtOpMode=%d)\n" ,pAd->CommonCfg.RegTransmitSetting.field.HTMODE)); - -return TRUE; - -} - -INT Set_HtStbc_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ - -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - -if (Value ==STBC_USE ) - pAd->CommonCfg.RegTransmitSetting.field.STBC =STBC_USE ; -else if ( Value ==STBC_NONE ) - pAd->CommonCfg.RegTransmitSetting.field.STBC =STBC_NONE ; -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_Stbc_Proc::(HtStbc=%d)\n" ,pAd->CommonCfg.RegTransmitSetting.field.STBC)); - -return TRUE; -} - -INT Set_HtHtc_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ - -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->HTCEnable = FALSE; -else if ( Value ==1 ) - pAd->HTCEnable = TRUE; -else -return FALSE;//Invalid argument - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtHtc_Proc::(HtHtc=%d)\n" ,pAd->HTCEnable)); - -return TRUE; -} - -INT Set_HtExtcha_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ - -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - -if (Value ==0 ) - pAd->CommonCfg.RegTransmitSetting.field.EXTCHA =EXTCHA_BELOW ; -else if ( Value ==1 ) - pAd->CommonCfg.RegTransmitSetting.field.EXTCHA =EXTCHA_ABOVE ; -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtExtcha_Proc::(HtExtcha=%d)\n" ,pAd->CommonCfg.RegTransmitSetting.field.EXTCHA)); - -return TRUE; -} - -INT Set_HtMpduDensity_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - -if (Value <=7 && Value >=0 ) - pAd->CommonCfg.BACapability.field.MpduDensity = Value; -else - pAd->CommonCfg.BACapability.field.MpduDensity =4 ; - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtMpduDensity_Proc::(HtMpduDensity=%d)\n" ,pAd->CommonCfg.BACapability.field.MpduDensity)); - -return TRUE; -} - -INT Set_HtBaWinSize_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - - -if (Value >=1 && Value <=64 ) - { - pAd->CommonCfg.REGBACapability.field.RxBAWinLimit = Value; - pAd->CommonCfg.BACapability.field.RxBAWinLimit = Value; - } -else - { - pAd->CommonCfg.REGBACapability.field.RxBAWinLimit =64 ; - pAd->CommonCfg.BACapability.field.RxBAWinLimit =64 ; - } - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtBaWinSize_Proc::(HtBaWinSize=%d)\n" ,pAd->CommonCfg.BACapability.field.RxBAWinLimit)); - -return TRUE; -} - -INT Set_HtRdg_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); - -if (Value ==0 ) - pAd->CommonCfg.bRdg = FALSE; -else if ( Value ==1 ) - { - pAd->HTCEnable = TRUE; - pAd->CommonCfg.bRdg = TRUE; - } -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtRdg_Proc::(HtRdg=%d)\n" ,pAd->CommonCfg.bRdg)); - -return TRUE; -} - -INT Set_HtLinkAdapt_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->bLinkAdapt = FALSE; -else if ( Value ==1 ) - { - pAd->HTCEnable = TRUE; - pAd->bLinkAdapt = TRUE; - } -else -return FALSE;//Invalid argument - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtLinkAdapt_Proc::(HtLinkAdapt=%d)\n" ,pAd->bLinkAdapt)); - -return TRUE; -} - -INT Set_HtAmsdu_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->CommonCfg.BACapability.field.AmsduEnable = FALSE; -else if ( Value ==1 ) - pAd->CommonCfg.BACapability.field.AmsduEnable = TRUE; -else -return FALSE;//Invalid argument - -SetCommonHT (pAd); - -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtAmsdu_Proc::(HtAmsdu=%d)\n" ,pAd->CommonCfg.BACapability.field.AmsduEnable)); - -return TRUE; -} - -INT Set_HtAutoBa_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - { - pAd->CommonCfg.BACapability.field.AutoBA = FALSE; - pAd->CommonCfg.BACapability.field.Policy =BA_NOTUSE ; - } -else if (Value ==1 ) - { - pAd->CommonCfg.BACapability.field.AutoBA = TRUE; - pAd->CommonCfg.BACapability.field.Policy =IMMED_BA ; - } -else -return FALSE;//Invalid argument - - pAd->CommonCfg.REGBACapability.field.AutoBA = pAd->CommonCfg.BACapability.field.AutoBA; - pAd->CommonCfg.REGBACapability.field.Policy = pAd->CommonCfg.BACapability.field.Policy; +Routine Description: +Remove WPA Key process -SetCommonHT (pAd); +Arguments: +pAd Pointer to our adapter +pBuf Pointer to the where the key stored -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtAutoBa_Proc::(HtAutoBa=%d)\n" ,pAd->CommonCfg.BACapability.field.AutoBA)); +Return Value: +NDIS_SUCCESS Add key successfully -return TRUE; +IRQL = DISPATCH_LEVEL -} +Note: -INT Set_HtProtect_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) +======================================================================== +*/ +VOID RTMPSetDesiredRates ( + IN PRTMP_ADAPTER pAdapter, + IN LONG Rates) { -ULONG Value; - - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->CommonCfg.bHTProtect = FALSE; -else if (Value ==1 ) - pAd->CommonCfg.bHTProtect = TRUE; -else -return FALSE;//Invalid argument +NDIS_802_11_RATES aryRates; -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtProtect_Proc::(HtProtect=%d)\n" ,pAd->CommonCfg.bHTProtect)); +memset (&aryRates,0x00 ,sizeof (NDIS_802_11_RATES )); +switch (pAdapter->CommonCfg.PhyMode) + { +case PHY_11A :// A only +switch (Rates) + { +case 6000000 ://6M + aryRates[0 ] =0x0c ;// 6M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_0 ; +break ; +case 9000000 ://9M + aryRates[0 ] =0x12 ;// 9M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_1 ; +break ; +case 12000000 ://12M + aryRates[0 ] =0x18 ;// 12M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_2 ; +break ; +case 18000000 ://18M + aryRates[0 ] =0x24 ;// 18M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_3 ; +break ; +case 24000000 ://24M + aryRates[0 ] =0x30 ;// 24M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_4 ; +break ; +case 36000000 ://36M + aryRates[0 ] =0x48 ;// 36M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_5 ; +break ; +case 48000000 ://48M + aryRates[0 ] =0x60 ;// 48M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_6 ; +break ; +case 54000000 ://54M + aryRates[0 ] =0x6c ;// 54M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_7 ; +break ; +case -1 ://Auto +default : + aryRates[0 ] =0x6c ;// 54Mbps + aryRates[1 ] =0x60 ;// 48Mbps + aryRates[2 ] =0x48 ;// 36Mbps + aryRates[3 ] =0x30 ;// 24Mbps + aryRates[4 ] =0x24 ;// 18M + aryRates[5 ] =0x18 ;// 12M + aryRates[6 ] =0x12 ;// 9M + aryRates[7 ] =0x0c ;// 6M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_AUTO ; +break ; + } +break ; +case PHY_11BG_MIXED :// B/G Mixed +case PHY_11B :// B only +case PHY_11ABG_MIXED :// A/B/G Mixed +default : +switch (Rates) + { +case 1000000 ://1M + aryRates[0 ] =0x02 ; + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_0 ; +break ; +case 2000000 ://2M + aryRates[0 ] =0x04 ; + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_1 ; +break ; +case 5000000 ://5.5M + aryRates[0 ] =0x0b ;// 5.5M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_2 ; +break ; +case 11000000 ://11M + aryRates[0 ] =0x16 ;// 11M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_3 ; +break ; +case 6000000 ://6M + aryRates[0 ] =0x0c ;// 6M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_0 ; +break ; +case 9000000 ://9M + aryRates[0 ] =0x12 ;// 9M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_1 ; +break ; +case 12000000 ://12M + aryRates[0 ] =0x18 ;// 12M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_2 ; +break ; +case 18000000 ://18M + aryRates[0 ] =0x24 ;// 18M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_3 ; +break ; +case 24000000 ://24M + aryRates[0 ] =0x30 ;// 24M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_4 ; +break ; +case 36000000 ://36M + aryRates[0 ] =0x48 ;// 36M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_5 ; +break ; +case 48000000 ://48M + aryRates[0 ] =0x60 ;// 48M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_6 ; +break ; +case 54000000 ://54M + aryRates[0 ] =0x6c ;// 54M + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_7 ; +break ; +case -1 ://Auto +default : +if (pAdapter->CommonCfg.PhyMode ==PHY_11B ) + {//B Only + aryRates[0 ] =0x16 ;// 11Mbps + aryRates[1 ] =0x0b ;// 5.5Mbps + aryRates[2 ] =0x04 ;// 2Mbps + aryRates[3 ] =0x02 ;// 1Mbps + } +else + {//(B/G) Mixed or (A/B/G) Mixed + aryRates[0 ] =0x6c ;// 54Mbps + aryRates[1 ] =0x60 ;// 48Mbps + aryRates[2 ] =0x48 ;// 36Mbps + aryRates[3 ] =0x30 ;// 24Mbps + aryRates[4 ] =0x16 ;// 11Mbps + aryRates[5 ] =0x0b ;// 5.5Mbps + aryRates[6 ] =0x04 ;// 2Mbps + aryRates[7 ] =0x02 ;// 1Mbps + } + pAdapter->StaCfg.DesiredTransmitSetting.field.MCS =MCS_AUTO ; +break ; + } +break ; + } -return TRUE; +NdisZeroMemory (pAdapter->CommonCfg.DesireRate,MAX_LEN_OF_SUPPORTED_RATES ); +NdisMoveMemory (pAdapter->CommonCfg.DesireRate, &aryRates,sizeof (NDIS_802_11_RATES )); +DBGPRINT (RT_DEBUG_TRACE , (" RTMPSetDesiredRates (%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x)\n" , + pAdapter->CommonCfg.DesireRate[0 ],pAdapter->CommonCfg.DesireRate[1 ], + pAdapter->CommonCfg.DesireRate[2 ],pAdapter->CommonCfg.DesireRate[3 ], + pAdapter->CommonCfg.DesireRate[4 ],pAdapter->CommonCfg.DesireRate[5 ], + pAdapter->CommonCfg.DesireRate[6 ],pAdapter->CommonCfg.DesireRate[7 ] )); +// Changing DesiredRate may affect the MAX TX rate we used to TX frames out +MlmeUpdateTxRates (pAdapter, FALSE,0 ); } -INT Set_SendPSMPAction_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -UCHAR mac[6 ], mode; -PSTRING token; -STRING sepValue[] =":" ,DASH ='-' ; -INT i; -MAC_TABLE_ENTRY *pEntry; - -//DBGPRINT(RT_DEBUG_TRACE,("\n%s\n", arg)); /* -The BARecTearDown inupt string format should be xx:xx:xx:xx:xx:xx-d, -=>The six 2 digit hex-decimal number previous are the Mac address, -=>The seventh decimal number is the mode value. -*/ -if (strlen (arg) <19 )//Mac address acceptable format 01:02:03:04:05:06 length 17 plus the "-" and mode value in decimal format. -return FALSE; - - token =strchr (arg,DASH ); -if ((token !=NULL ) && (strlen (token)>1 )) - { - mode =simple_strtol ((token+1 ),0 ,10 ); -if (mode >MMPS_ENABLE ) -return FALSE; +======================================================================== - *token ='\0' ; -for (i =0 , token =rstrtok (arg, &sepValue[0 ]); token; token =rstrtok (NULL , &sepValue[0 ]), i++) - { -if ((strlen (token) !=2 ) || (!isxdigit (*token)) || (!isxdigit (*(token+1 )))) -return FALSE; -AtoH (token, (&mac[i]),1 ); - } -if (i !=6 ) -return FALSE; +Routine Description: +Remove All WPA Keys -DBGPRINT (RT_DEBUG_OFF , ("\n%02x:%02x:%02x:%02x:%02x:%02x-%02x" , - mac[0 ], mac[1 ], mac[2 ], mac[3 ], mac[4 ], mac[5 ], mode)); +Arguments: +pAd Pointer to our adapter - pEntry =MacTableLookup (pAd, mac); +Return Value: +None -if (pEntry) { -DBGPRINT (RT_DEBUG_OFF , ("\nSendPSMPAction MIPS mode = %d\n" , mode)); -SendPSMPAction (pAd, pEntry->Aid, mode); - } +IRQL = DISPATCH_LEVEL -return TRUE; - } +Note: -return FALSE; +======================================================================== +*/ +VOID RTMPWPARemoveAllKeys ( + IN PRTMP_ADAPTER pAd) +{ +UCHAR i; -} +DBGPRINT (RT_DEBUG_TRACE ,("RTMPWPARemoveAllKeys(AuthMode=%d, WepStatus=%d)\n" , pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus)); +RTMP_CLEAR_PSFLAG (pAd, fRTMP_PS_CAN_GO_SLEEP); +// For WEP/CKIP, there is no need to remove it, since WinXP won't set it again after +// Link up. And it will be replaced if user changed it. +if (pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA) +return ; -INT Set_HtMIMOPSmode_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; +// For WPA-None, there is no need to remove it, since WinXP won't set it again after +// Link up. And it will be replaced if user changed it. +if (pAd->StaCfg.AuthMode == Ndis802_11AuthModeWPANone) +return ; - Value =simple_strtol (arg,0 ,10 ); +// set BSSID wcid entry of the Pair-wise Key table as no-security mode +AsicRemovePairwiseKeyEntry (pAd,BSS0 ,BSSID_WCID ); -if (Value <=3 && Value >=0 ) - pAd->CommonCfg.BACapability.field.MMPSmode = Value; -else - pAd->CommonCfg.BACapability.field.MMPSmode =3 ; +// set all shared key mode as no-security. +for (i =0 ; i <SHARE_KEY_NUM ; i++) + { +DBGPRINT (RT_DEBUG_TRACE ,("remove %s key #%d\n" , CipherName[pAd->SharedKey[BSS0 ][i].CipherAlg], i)); +NdisZeroMemory (&pAd->SharedKey[BSS0 ][i],sizeof (CIPHER_KEY )); -SetCommonHT (pAd); +AsicRemoveSharedKeyEntry (pAd,BSS0 , i); + } +RTMP_SET_PSFLAG (pAd, fRTMP_PS_CAN_GO_SLEEP); +} -DBGPRINT (RT_DEBUG_TRACE , ("Set_HtMIMOPSmode_Proc::(MIMOPS mode=%d)\n" ,pAd->CommonCfg.BACapability.field.MMPSmode)); -return TRUE; -} +/* +======================================================================== +Routine Description: +As STA's BSSID is a WC too, it uses shared key table. +This function write correct unicast TX key to ASIC WCID. +And we still make a copy in our MacTab.Content[BSSID_WCID].PairwiseKey. +Caller guarantee TKIP/AES always has keyidx = 0. (pairwise key) +Caller guarantee WEP calls this function when set Txkey, default key index=0~3. -INT Set_ForceShortGI_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; +Arguments: +pAd Pointer to our adapter +pKey Pointer to the where the key stored - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->WIFItestbed.bShortGI = FALSE; -else if (Value ==1 ) - pAd->WIFItestbed.bShortGI = TRUE; -else -return FALSE;//Invalid argument +Return Value: +NDIS_SUCCESS Add key successfully -SetCommonHT (pAd); +IRQL = DISPATCH_LEVEL -DBGPRINT (RT_DEBUG_TRACE , ("Set_ForceShortGI_Proc::(ForceShortGI=%d)\n" , pAd->WIFItestbed.bShortGI)); +Note: -return TRUE; -} +======================================================================== +*/ +/* +======================================================================== +Routine Description: +Change NIC PHY mode. Re-association may be necessary. possible settings +include - PHY_11B, PHY_11BG_MIXED, PHY_11A, and PHY_11ABG_MIXED +Arguments: +pAd - Pointer to our adapter +phymode - +IRQL = PASSIVE_LEVEL +IRQL = DISPATCH_LEVEL -INT Set_ForceGF_Proc ( +======================================================================== +*/ +VOID RTMPSetPhyMode ( IN PRTMP_ADAPTER pAd, - IN PSTRING arg) + IN ULONG phymode) { -ULONG Value; +INT i; +// the selected phymode must be supported by the RF IC encoded in E2PROM - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->WIFItestbed.bGreenField = FALSE; -else if (Value ==1 ) - pAd->WIFItestbed.bGreenField = TRUE; -else -return FALSE;//Invalid argument +// if no change, do nothing +/* bug fix +if (pAd->CommonCfg.PhyMode == phymode) +return; +*/ + pAd->CommonCfg.PhyMode = (UCHAR )phymode; -SetCommonHT (pAd); +DBGPRINT (RT_DEBUG_TRACE ,("RTMPSetPhyMode : PhyMode=%d, channel=%d \n" , pAd->CommonCfg.PhyMode, pAd->CommonCfg.Channel)); -DBGPRINT (RT_DEBUG_TRACE , ("Set_ForceGF_Proc::(ForceGF=%d)\n" , pAd->WIFItestbed.bGreenField)); +BuildChannelList (pAd); -return TRUE; -} +// sanity check user setting +for (i =0 ; i < pAd->ChannelListNum; i++) + { +if (pAd->CommonCfg.Channel == pAd->ChannelList[i].Channel) +break ; + } -INT Set_HtMimoPs_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg) -{ -ULONG Value; +if (i == pAd->ChannelListNum) + { + pAd->CommonCfg.Channel =FirstChannel (pAd); +DBGPRINT (RT_DEBUG_ERROR , ("RTMPSetPhyMode: channel is out of range, use first channel=%d \n" , pAd->CommonCfg.Channel)); + } - Value =simple_strtol (arg,0 ,10 ); -if (Value ==0 ) - pAd->CommonCfg.bMIMOPSEnable = FALSE; -else if (Value ==1 ) - pAd->CommonCfg.bMIMOPSEnable = TRUE; -else -return FALSE;//Invalid argument +NdisZeroMemory (pAd->CommonCfg.SupRate,MAX_LEN_OF_SUPPORTED_RATES ); +NdisZeroMemory (pAd->CommonCfg.ExtRate,MAX_LEN_OF_SUPPORTED_RATES ); +NdisZeroMemory (pAd->CommonCfg.DesireRate,MAX_LEN_OF_SUPPORTED_RATES ); +switch (phymode) { +case PHY_11B : + pAd->CommonCfg.SupRate[0 ] =0x82 ;// 1 mbps, in units of 0.5 Mbps, basic rate + pAd->CommonCfg.SupRate[1 ] =0x84 ;// 2 mbps, in units of 0.5 Mbps, basic rate + pAd->CommonCfg.SupRate[2 ] =0x8B ;// 5.5 mbps, in units of 0.5 Mbps, basic rate + pAd->CommonCfg.SupRate[3 ] =0x96 ;// 11 mbps, in units of 0.5 Mbps, basic rate + pAd->CommonCfg.SupRateLen =4 ; + pAd->CommonCfg.ExtRateLen =0 ; + pAd->CommonCfg.DesireRate[0 ] =2 ;// 1 mbps, in units of 0.5 Mbps + pAd->CommonCfg.DesireRate[1 ] =4 ;// 2 mbps, in units of 0.5 Mbps
Lines of this file are not shown. View the raw message.
drivers/staging/rt2860/rtmp.h +0 -204
204 lines not on this page · raw message
drivers/staging/rt2860/sta_ioctl.c +1 -1304
1,305 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 7/12 Staging: rt28x0: remove optional loading of EEPROM from file in eFuse mode
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove optional loading of EEPROM from file in eFuse mode
--- drivers/staging/rt2860/common/cmm_profile.c | 10 drivers/staging/rt2860/common/ee_efuse.c | 788 ---------------------------- drivers/staging/rt2860/common/eeprom.c | 3 drivers/staging/rt2860/common/rtmp_init.c | 9 drivers/staging/rt2860/rt_linux.c | 20 drivers/staging/rt2860/rtmp.h | 21 6 files changed, 1 insertion(+), 850 deletions(-)
drivers/staging/rt2860/common/cmm_profile.c +0 -10
@@ -1194,16 +1194,6 @@ NDIS_STATUS RTMPSetProfileParameters( retval =RT_CfgSetCountryRegion (pAd, tmpbuf,BAND_5G );DBGPRINT (RT_DEBUG_TRACE , ("CountryRegionABand=%d\n" , pAd->CommonCfg.CountryRegionForABand)); } -#ifdef RTMP_EFUSE_SUPPORT -#ifdef RT30xx -//EfuseBufferMode -if (RTMPGetKeyParameter ("EfuseBufferMode" , tmpbuf,25 , pBuffer, TRUE)) - { - pAd->bEEPROMFile = (UCHAR )simple_strtol (tmpbuf,0 ,10 ); -DBGPRINT (RT_DEBUG_TRACE , ("EfuseBufferMode=%d\n" , pAd->bUseEfuse)); - } -#endif // RT30xx // -#endif // RTMP_EFUSE_SUPPORT // //CountryCode if (RTMPGetKeyParameter ("CountryCode" , tmpbuf,25 , pBuffer, TRUE)) {
drivers/staging/rt2860/common/ee_efuse.c +1 -787
823 lines not on this page · raw message
drivers/staging/rt2860/common/eeprom.c +0 -3
@@ -69,10 +69,7 @@ INT RtmpChipOpsEepromHook(return 0 ; } else - { - pAd->bFroceEEPROMBuffer = FALSE;DBGPRINT (RT_DEBUG_TRACE , ("NVM is EEPROM\n" )); - }#endif // RTMP_EFUSE_SUPPORT // #endif // RT30xx //
drivers/staging/rt2860/common/rtmp_init.c +0 -9
@@ -694,15 +694,6 @@ VOID NICReadEEPROMParameters(if (pAd->chipOps.eeinit) pAd->chipOps.eeinit (pAd); -#ifdef RTMP_EFUSE_SUPPORT -#ifdef RT30xx -if (!pAd->bFroceEEPROMBuffer && pAd->bEEPROMFile) - { -DBGPRINT (RT_DEBUG_TRACE , ("--> NICReadEEPROMParameters::(Efuse)Load to EEPROM Buffer Mode\n" )); -eFuseLoadEEPROM (pAd); - } -#endif // RT30xx // -#endif // RTMP_EFUSE_SUPPORT // // Init EEPROM Address Number, before access EEPROM; if 93c46, EEPROMAddressNum=6, else if 93c66, EEPROMAddressNum=8 RTMP_IO_READ32 (pAd,E2PROM_CSR , &data);
drivers/staging/rt2860/rt_linux.c +0 -20
@@ -1065,26 +1065,6 @@ int RtmpOSFileWrite(RTMP_OS_FD osfd, chareturn osfd->f_op->write (osfd, pDataPtr, (size_t )writeLen, &osfd->f_pos); } - -void RtmpOSFSInfoChange (RTMP_OS_FS_INFO *pOSFSInfo,BOOLEAN bSet) -{ -if (bSet) - { -// Save uid and gid used for filesystem access. -// Set user and group to 0 (root) - pOSFSInfo->fsuid =current_fsuid (); - pOSFSInfo->fsgid =current_fsgid (); - pOSFSInfo->fs =get_fs (); -set_fs (KERNEL_DS ); - } -else - { -set_fs (pOSFSInfo->fs); - } -} - - -/******************************************************************************* Task create/management/kill related functions.
drivers/staging/rt2860/rtmp.h +0 -21
@@ -2258,8 +2258,6 @@ struct _RTMP_ADAPTER#ifdef RT30xx#ifdef RTMP_EFUSE_SUPPORT BOOLEAN bUseEfuse; -BOOLEAN bEEPROMFile; -BOOLEAN bFroceEEPROMBuffer;UCHAR EEPROMImage[1024 ];#endif // RTMP_EFUSE_SUPPORT // #endif // RT30xx //
@@ -4021,10 +4019,6 @@ INT set_eFusedump_Proc( IN PRTMP_ADAPTER pAd, IN PSTRING arg); -INT set_eFuseLoadFromBin_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg); - VOID eFusePhysicalReadRegisters( IN PRTMP_ADAPTER pAd, IN USHORT Offset,
@@ -4034,16 +4028,6 @@ VOID eFusePhysicalReadRegisters(int RtmpEfuseSupportCheck ( IN RTMP_ADAPTER *pAd); -INT set_eFuseBufferModeWriteBack_Proc ( - IN PRTMP_ADAPTER pAd, - IN PSTRING arg); - -INT eFuseLoadEEPROM ( - IN PRTMP_ADAPTER pAd); - -INT eFuseWriteEeeppromBuf ( - IN PRTMP_ADAPTER pAd); - VOID eFuseGetFreeBlockCount(IN PRTMP_ADAPTER pAd,PUINT EfuseFreeBlock);
@@ -5632,10 +5616,5 @@ int RtmpOSFileWrite( IN char *pDataPtr, IN int writeLen); -void RtmpOSFSInfoChange ( - IN RTMP_OS_FS_INFO *pOSFSInfo, - IN BOOLEAN bSet); - -#endif // __RTMP_H__
PATCH 10/12 Staging: rt28x0: remove dead code from rtmp_phy.h
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove dead code from rtmp_phy.h
--- drivers/staging/rt2860/chip/rtmp_phy.h | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-)
drivers/staging/rt2860/chip/rtmp_phy.h +1 -27
@@ -278,18 +278,6 @@But for some chipset which didn't have mcu (e.g., RBUS based chipset), we will use this function too and didn't access the bbp register via the MCU. */ -#if 0 -#define RTMP_BBP_IO_READ8_BY_REG_ID (_A, _I, _pV) \ - do{ \ - if ((_A)->bPCIclkOff == FALSE) \ - { \ - if ((_A)->infType == RTMP_DEV_INF_RBUS) \ - RTMP_BBP_IO_READ8((_A), (_I), (_pV), FALSE); \ - else \ - RTMP_BBP_IO_READ8((_A), (_I), (_pV), TRUE); \ - } \ - }while(0) -#else // Read BBP register by register's ID. Generate PER to test BA #define RTMP_BBP_IO_READ8_BY_REG_ID (_A, _I, _pV) \ { \
@@ -381,7 +369,6 @@ *(_pV) = (_A)->BbpWriteLatch[_I]; \ } \ } -#endif // 0 // /* basic marco for BBP write operation.
@@ -441,18 +428,6 @@But for some chipset which didn't have mcu (e.g., RBUS based chipset), we will use this function too and didn't access the bbp register via the MCU. */ -#if 0 -#define RTMP_BBP_IO_WRITE8_BY_REG_ID (_A, _I, _pV) \ - do{ \ - if ((_A)->bPCIclkOff == FALSE) \ - { \ - if ((_A)->infType == RTMP_DEV_INF_RBUS) \ - RTMP_BBP_IO_WRITE8((_A), (_I), (_pV), FALSE); \ - else \ - RTMP_BBP_IO_WRITE8((_A), (_I), (_pV), TRUE); \ - } \ - }while(0) -#else // Write BBP register by register's ID & value #define RTMP_BBP_IO_WRITE8_BY_REG_ID (_A, _I, _V) \ { \
@@ -538,9 +513,8 @@ DBGPRINT_ERR(("****** BBP_Write_Latch Buffer exceeds max boundry ****** \n")); \ } \ } -#endif // 0 // -#endif // RTMP_MAC_PCI // +#ifdef RTMP_MAC_USB #define RTMP_BBP_IO_READ8_BY_REG_ID (_A, _I, _pV) RTUSBReadBBPRegister(_A, _I, _pV)#define RTMP_BBP_IO_WRITE8_BY_REG_ID (_A, _I, _V) RTUSBWriteBBPRegister(_A, _I, _V)
PATCH 9/12 Staging: rt28x0: remove optional cmm profile parameters
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove optional cmm profile parameters
--- drivers/staging/rt2860/Makefile | 1 drivers/staging/rt2860/common/cmm_profile.c | 1769 ---------------------------- drivers/staging/rt2860/rtmp.h | 34 drivers/staging/rt2870/Makefile | 1 4 files changed, 1805 deletions(-)
drivers/staging/rt2860/Makefile +0 -1
@@ -27,7 +27,6 @@ rt2860sta-objs := \ common/spectrum.o \ common/rtmp_timer.o \ common/rt_channel.o \ - common/cmm_profile.o \ common/cmm_asic.o \ sta/assoc.o \ sta/auth.o \
drivers/staging/rt2860/common/cmm_profile.c deleted +0 -1769
1,769 lines not on this page · raw message
drivers/staging/rt2860/rtmp.h +0 -34
@@ -2451,17 +2451,6 @@ NDIS_STATUS RTMPAllocAdapterBlock(NDIS_STATUS RTMPAllocTxRxRingMemory ( IN PRTMP_ADAPTER pAd); -NDIS_STATUS RTMPSetProfileParameters ( - IN RTMP_ADAPTER *pAd, - IN PSTRING pBuffer); - -INT RTMPGetKeyParameter ( - IN PSTRING key, - OUT PSTRING dest, - IN INT destsize, - IN PSTRING buffer, - IN BOOLEAN bTrimSpace); -VOID RTMPFreeAdapter ( IN PRTMP_ADAPTER pAd);
@@ -4628,33 +4617,10 @@ VOID BARecSessionTearDown(BOOLEAN ba_reordering_resource_init (PRTMP_ADAPTER pAd,int num);void ba_reordering_resource_release (PRTMP_ADAPTER pAd); - - - -BOOLEAN rtstrmactohex ( - IN PSTRING s1, - IN PSTRING s2); - -BOOLEAN rtstrcasecmp ( - IN PSTRING s1, - IN PSTRING s2); - -PSTRING rtstrstruncasecmp ( - IN PSTRING s1, - IN PSTRING s2); - -PSTRING rtstrstr ( - IN const PSTRING s1, - IN const PSTRING s2); -PSTRING rstrtok ( IN PSTRING s, IN const PSTRING ct); -int rtinet_aton ( -const PSTRING cp, -unsigned int *addr); -////////// common ioctl functions ////////// INT SetCommonHT ( IN PRTMP_ADAPTER pAd);
drivers/staging/rt2870/Makefile +0 -1
@@ -28,7 +28,6 @@ rt2870sta-objs := \ common/spectrum.o \ common/rtmp_timer.o \ common/rt_channel.o \ - common/cmm_profile.o \ common/cmm_asic.o \ sta/assoc.o \ sta/auth.o \
PATCH 11/12 Staging: rt28x0: remove unused SHA256 code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove unused SHA256 code
--- drivers/staging/rt2860/common/crypt_hmac.c | 85 --------- drivers/staging/rt2860/common/crypt_sha2.c | 257 ----------------------------- drivers/staging/rt2860/crypt_hmac.h | 11 - drivers/staging/rt2860/crypt_sha2.h | 28 --- 4 files changed, 381 deletions(-)
drivers/staging/rt2860/common/crypt_hmac.c +0 -85
@@ -109,91 +109,6 @@ VOID HMAC_SHA1 ( } /* End of HMAC_SHA1 */#endif /* HMAC_SHA1_SUPPORT */ - -#ifdef HMAC_SHA256_SUPPORT -/* -======================================================================== -Routine Description: -HMAC using SHA256 hash function - -Arguments: -key Secret key -key_len The length of the key in bytes -message Message context -message_len The length of message in bytes -macLen Request the length of message authentication code - -Return Value: -mac Message authentication code - -Note: -None -======================================================================== -*/ -VOID HMAC_SHA256 ( - IN const UINT8 Key[], - IN UINT KeyLen, - IN const UINT8 Message[], - IN UINT MessageLen, - OUT UINT8 MAC[], - IN UINT MACLen) -{ -SHA256_CTX_STRUC sha_ctx1; -SHA256_CTX_STRUC sha_ctx2; -UINT8 K0 [SHA256_BLOCK_SIZE ]; -UINT8 Digest[SHA256_DIGEST_SIZE ]; -UINT index; - -NdisZeroMemory (&sha_ctx1,sizeof (SHA256_CTX_STRUC )); -NdisZeroMemory (&sha_ctx2,sizeof (SHA256_CTX_STRUC )); -/* -* If the length of K = B(Block size): K0 = K. -* If the length of K > B: hash K to obtain an L byte string, -* then append (B-L) zeros to create a B-byte string K0 (i.e., K0 = H(K) || 00...00). -* If the length of K < B: append zeros to the end of K to create a B-byte string K0 -*/ -NdisZeroMemory (K0 ,SHA256_BLOCK_SIZE ); -if (KeyLen <=SHA256_BLOCK_SIZE ) { -NdisMoveMemory (K0 , Key, KeyLen); - }else { -RT_SHA256 (Key, KeyLen,K0 ); - } - -/* Exclusive-Or K0 with ipad */ -/* ipad: Inner pad; the byte x��36�� repeated B times. */ -for (index =0 ; index <SHA256_BLOCK_SIZE ; index++) -K0 [index] ^=0x36 ; -/* End of for */ - -SHA256_Init (&sha_ctx1); -/* H(K0^ipad) */ -SHA256_Append (&sha_ctx1,K0 ,sizeof (K0 )); -/* H((K0^ipad)||text) */ -SHA256_Append (&sha_ctx1, Message, MessageLen); -SHA256_End (&sha_ctx1, Digest); - -/* Exclusive-Or K0 with opad and remove ipad */ -/* opad: Outer pad; the byte x��5c�� repeated B times. */ -for (index =0 ; index <SHA256_BLOCK_SIZE ; index++) -K0 [index] ^=0x36 ^0x5c ; -/* End of for */ - -SHA256_Init (&sha_ctx2); -/* H(K0^opad) */ -SHA256_Append (&sha_ctx2,K0 ,sizeof (K0 )); -/* H( (K0^opad) || H((K0^ipad)||text) ) */ -SHA256_Append (&sha_ctx2, Digest,SHA256_DIGEST_SIZE ); -SHA256_End (&sha_ctx2, Digest); - -if (MACLen >SHA256_DIGEST_SIZE ) -NdisMoveMemory (MAC , Digest,SHA256_DIGEST_SIZE ); -else -NdisMoveMemory (MAC , Digest, MACLen); - -}/* End of HMAC_SHA256 */ -#endif /* HMAC_SHA256_SUPPORT */ - -#ifdef HMAC_MD5_SUPPORT /* ========================================================================
drivers/staging/rt2860/common/crypt_sha2.c +0 -257
268 lines not on this page · raw message
drivers/staging/rt2860/crypt_hmac.h +0 -11
@@ -57,17 +57,6 @@ VOID HMAC_SHA1 ( IN UINT MACLen);#endif /* SHA1_SUPPORT */ -#ifdef SHA256_SUPPORT -#define HMAC_SHA256_SUPPORT -VOID HMAC_SHA256 ( - IN const UINT8 Key[], - IN UINT KeyLen, - IN const UINT8 Message[], - IN UINT MessageLen, - OUT UINT8 MAC[], - IN UINT MACLen); -#endif /* SHA256_SUPPORT */ -#ifdef MD5_SUPPORT #define HMAC_MD5_SUPPORT VOID HMAC_MD5 (
drivers/staging/rt2860/crypt_sha2.h +0 -28
@@ -50,7 +50,6 @@/* Algorithm options */ #define SHA1_SUPPORT -#define SHA256_SUPPORT #ifdef SHA1_SUPPORT #define SHA1_BLOCK_SIZE 64/* 512 bits = 64 bytes */
@@ -79,31 +78,4 @@ VOID RT_SHA1 ( OUT UINT8 DigestMessage[]);#endif /* SHA1_SUPPORT */ -#ifdef SHA256_SUPPORT -#define SHA256_BLOCK_SIZE 64/* 512 bits = 64 bytes */ -#define SHA256_DIGEST_SIZE 32/* 256 bits = 32 bytes */ -typedef struct _SHA256_CTX_STRUC { -UINT32 HashValue[8 ];/* 8 = (SHA256_DIGEST_SIZE / 32) */ -UINT64 MessageLen;/* total size */ -UINT8 Block[SHA256_BLOCK_SIZE ]; -UINT BlockLen; -}SHA256_CTX_STRUC , *PSHA256_CTX_STRUC ; - -VOID SHA256_Init ( - IN SHA256_CTX_STRUC *pSHA_CTX); -VOID SHA256_Hash ( - IN SHA256_CTX_STRUC *pSHA_CTX); -VOID SHA256_Append ( - IN SHA256_CTX_STRUC *pSHA_CTX, - IN const UINT8 Message[], - IN UINT MessageLen); -VOID SHA256_End ( - IN SHA256_CTX_STRUC *pSHA_CTX, - OUT UINT8 DigestMessage[]); -VOID RT_SHA256 ( - IN const UINT8 Message[], - IN UINT MessageLen, - OUT UINT8 DigestMessage[]); -#endif /* SHA256_SUPPORT */ -#endif /* __CRYPT_SHA2_H__ */
PATCH 12/12 Staging: rt28x0: remove dead code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: remove dead code
--- drivers/staging/rt2860/oid.h | 19 ------------------- drivers/staging/rt2860/rt_config.h | 8 -------- drivers/staging/rt2860/rt_linux.h | 10 ---------- drivers/staging/rt2860/rtmp.h | 13 ------------- drivers/staging/rt2860/rtmp_def.h | 9 --------- 5 files changed, 59 deletions(-)
drivers/staging/rt2860/oid.h +0 -19
@@ -502,19 +502,6 @@ typedef struct _NDIS_802_11_AUTHENTICATINDIS_802_11_AUTHENTICATION_REQUEST Request[1 ]; }NDIS_802_11_AUTHENTICATION_EVENT , *PNDIS_802_11_AUTHENTICATION_EVENT ; -/* -typedef struct _NDIS_802_11_TEST -{ -ULONG Length; -ULONG Type; -union -{ -NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent; -NDIS_802_11_RSSI RssiTrigger; -}; -} NDIS_802_11_TEST, *PNDIS_802_11_TEST; -*/ -// 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE typedef enum _NDIS_802_11_MEDIA_STREAM_MODE {
@@ -553,10 +540,6 @@ typedef struct _NDIS_802_11_CAPABILITYNDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1 ]; }NDIS_802_11_CAPABILITY , *PNDIS_802_11_CAPABILITY ; -#ifdef LINUX -#endif // LINUX // - -#define RT_PRIV_IOCTL (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon#define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02)
@@ -593,8 +576,6 @@ enum {#define OID_802_11_GET_COUNTRY_CODE 0x0716#define OID_802_11_GET_CHANNEL_GEOGRAPHY 0x0717 -//#define RT_OID_802_11_STATISTICS (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS) -#define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk#define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741#define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742
drivers/staging/rt2860/rt_config.h +0 -8
@@ -64,14 +64,6 @@#include "rtmp_mcu.h" #endif -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - - - -#ifdef IGMP_SNOOP_SUPPORT #include "igmp_snoop.h" #endif // IGMP_SNOOP_SUPPORT //
drivers/staging/rt2860/rt_linux.h +0 -10
@@ -75,16 +75,6 @@#include <linux/kthread.h> #endif // KTHREAD_SUPPORT // -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - - - -#ifdef KTHREAD_SUPPORT -#endif // KTHREAD_SUPPORT // -/*********************************************************************************** * Profile related sections ***********************************************************************************/
drivers/staging/rt2860/rtmp.h +0 -13
@@ -41,23 +41,10 @@#define __RTMP_H__#include "spectrum_def.h" -#include "rtmp_dot11.h" - -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - - -#if defined(AP_WSC_INCLUDED ) || defined(STA_WSC_INCLUDED ) -#define WSC_INCLUDED -#endif -#include "rtmp_chip.h" -typedef struct _RTMP_ADAPTER RTMP_ADAPTER ;typedef struct _RTMP_ADAPTER *PRTMP_ADAPTER ;
drivers/staging/rt2860/rtmp_def.h +0 -9
@@ -41,15 +41,6 @@#include "oid.h" -#undef AP_WSC_INCLUDED -#undef STA_WSC_INCLUDED -#undef WSC_INCLUDED - - - -#if defined(AP_WSC_INCLUDED ) || defined(STA_WSC_INCLUDED ) -#define WSC_INCLUDED -#endif // // Debug information verbosity: lower values indicate higher urgency //
PATCH 8/12 Staging: rt28x0: fix some build warnings
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt28x0: fix some build warnings
--- drivers/staging/rt2860/chip/rtmp_phy.h | 8 +++--- drivers/staging/rt2860/chips/rt30xx.c | 2 + drivers/staging/rt2860/common/cmm_asic.c | 6 ++-- drivers/staging/rt2860/common/cmm_mac_pci.c | 7 ++--- drivers/staging/rt2860/common/mlme.c | 1 drivers/staging/rt2860/common/rtmp_init.c | 3 +- drivers/staging/rt2860/common/rtmp_mcu.c | 2 + drivers/staging/rt2860/pci_main_dev.c | 35 +++++++++++++++++----------- drivers/staging/rt2860/rt_linux.c | 10 +++----- drivers/staging/rt2860/rt_main_dev.c | 6 +--- drivers/staging/rt2860/sta/connect.c | 1 drivers/staging/rt2860/usb_main_dev.c | 7 +++-- 12 files changed, 48 insertions(+), 40 deletions(-)
drivers/staging/rt2860/chip/rtmp_phy.h +4 -4
@@ -552,8 +552,8 @@#ifdef RT30xx#define RTMP_ASIC_MMPS_DISABLE (_pAd) \ do{ \ - UCHAR _bbpData; \ - UINT32 _macData; \ + UINT32 _macData; \ + UCHAR _bbpData = 0; \/* disable MMPS BBP control register */ \RTMP_BBP_IO_READ8_BY_REG_ID (_pAd,BBP_R3 , &_bbpData); \ _bbpData &= ~(0x04 );/*bit 2*/ \
@@ -568,8 +568,8 @@#define RTMP_ASIC_MMPS_ENABLE (_pAd) \ do{ \ - UCHAR _bbpData; \ - UINT32 _macData; \ + UINT32 _macData; \ + UCHAR _bbpData = 0; \/* enable MMPS BBP control register */ \RTMP_BBP_IO_READ8_BY_REG_ID (_pAd,BBP_R3 , &_bbpData); \ _bbpData |= (0x04 );/*bit 2*/ \
drivers/staging/rt2860/chips/rt30xx.c +2 -0
@@ -86,7 +86,9 @@ VOID RT30xxSetRxAnt( IN UCHAR Ant) {UINT32 Value; +#ifdef RTMP_MAC_PCI UINT32 x; +#endif if ((pAd->EepromAccess) || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)) ||
drivers/staging/rt2860/common/cmm_asic.c +3 -3
@@ -810,9 +810,9 @@ VOID AsicSwitchChannel(#if defined(RT3090 ) || defined(RT3390 )// PCIe PHY Transmit attenuation adjustment -if (IS_RT3090A (pAd) ||IS_RT3390 (pAd)) - { -TX_ATTENUATION_CTRL_STRUC TxAttenuationCtrl = {0 }; +if (IS_RT3090A (pAd) ||IS_RT3390 (pAd)) { +TX_ATTENUATION_CTRL_STRUC + TxAttenuationCtrl = { .word =0 };RTMP_IO_READ32 (pAd,PCIE_PHY_TX_ATTENUATION_CTRL , &TxAttenuationCtrl.word);
drivers/staging/rt2860/common/cmm_mac_pci.c +3 -4
@@ -1173,10 +1173,9 @@ BOOLEAN RT28xxPciAsicRadioOn( pAd->Mlme.bPsPollTimerRunning = FALSE;RTMPCancelTimer (&pAd->Mlme.PsPollTimer, &Cancelled); } -if ((pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)&& - ((Level ==GUIRADIO_OFF ) || (Level ==GUI_IDLE_POWER_SAVE )) - ||(RTMP_TEST_PSFLAG (pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND))) - { +if ((pAd->StaCfg.PSControl.field.EnableNewPS == TRUE && + (Level ==GUIRADIO_OFF || Level ==GUI_IDLE_POWER_SAVE )) || +RTMP_TEST_PSFLAG (pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND)) {// Some chips don't need to delay 6ms, so copy RTMPPCIePowerLinkCtrlRestore // return condition here. /*
drivers/staging/rt2860/common/mlme.c +0 -1
@@ -679,7 +679,6 @@ VOID MlmePeriodicExec( {ULONG TxTotalCnt;PRTMP_ADAPTER pAd = (RTMP_ADAPTER *)FunctionContext; -SHORT realavgrssi;#ifdef RTMP_MAC_PCI {
drivers/staging/rt2860/common/rtmp_init.c +2 -1
@@ -3621,7 +3621,8 @@ INT RtmpRaDevCtrlInit(#ifdef RTMP_MAC_USB init_MUTEX (&(pAd->UsbVendorReq_semaphore)); -os_alloc_mem (pAd, (PUCHAR )&pAd->UsbVendorReqBuf,MAX_PARAM_BUFFER_SIZE -1 ); +os_alloc_mem (pAd, (PUCHAR *)&pAd->UsbVendorReqBuf, +MAX_PARAM_BUFFER_SIZE -1 );if (pAd->UsbVendorReqBuf ==NULL ) {DBGPRINT (RT_DEBUG_ERROR , ("Allocate vendor request temp buffer failed!\n" ));
drivers/staging/rt2860/common/rtmp_mcu.c +2 -0
@@ -119,7 +119,9 @@ NDIS_STATUS RtmpAsicLoadFirmware(PUCHAR pFirmwareImage =NULL ;ULONG FileLength, Index;UINT32 MacReg =0 ; +#ifdef RTMP_MAC_USB UINT32 Version = (pAd->MACVersion >>16 ); +#endif // New 8k byte firmware size for RT3071/RT3072 {
drivers/staging/rt2860/pci_main_dev.c +22 -13
@@ -310,7 +310,7 @@ static INT __devinit rt2860_probe(return rv; } - print_name =pci_name (pci_dev); + print_name = (PSTRING )pci_name (pci_dev);if ((rv =pci_request_regions (pci_dev, print_name)) !=0 ) {
@@ -883,7 +883,7 @@ VOID RTMPPCIeLinkCtrlValueRestore(#endif // RT2860 // // Check PSControl Configuration if (pAd->StaCfg.PSControl.field.EnableNewPS == FALSE) -return TRUE; +return ;//3090 will not execute the following codes. // Check interface : If not PCIe interface, return.
@@ -977,7 +977,7 @@ VOID RTMPPCIeLinkCtrlSetting(#endif // RT2860 // // Check PSControl Configuration if (pAd->StaCfg.PSControl.field.EnableNewPS == FALSE) -return TRUE; +return ;// Check interface : If not PCIe interface, return. //Block 3090 to enter the following function
@@ -1086,17 +1086,17 @@ VOID RTMPrt3xSetPCIePowerLinkCtrl( IN PRTMP_ADAPTER pAd) { -ULONG HostConfiguration; +ULONG HostConfiguration =0 ;ULONG Configuration; -ULONG Vendor; -ULONG offset;POS_COOKIE pObj;INT pos;USHORT reg16; pObj = (POS_COOKIE ) pAd->OS_Cookie; -DBGPRINT (RT_DEBUG_INFO , ("RTMPrt3xSetPCIePowerLinkCtrl.===> %x\n" , pAd->StaCfg.PSControl.word)); +DBGPRINT (RT_DEBUG_INFO , + ("RTMPrt3xSetPCIePowerLinkCtrl.===> %lx\n" , + pAd->StaCfg.PSControl.word));// Check PSControl Configuration if (pAd->StaCfg.PSControl.field.EnableNewPS == FALSE)
@@ -1104,7 +1104,6 @@ VOID RTMPrt3xSetPCIePowerLinkCtrl(RTMPFindHostPCIDev (pAd);if (pObj->parent_pci_dev) { -USHORT vendor_id;// Find PCI-to-PCI Bridge Express Capability Offset pos =pci_find_capability (pObj->parent_pci_dev,PCI_CAP_ID_EXP );
@@ -1129,7 +1128,10 @@ VOID RTMPrt3xSetPCIePowerLinkCtrl(// Because in rt30xxForceASPMTest Mode, Force turn on L0s, L1. // Fix HostConfiguration bit0:1 = 0x3 for later use. HostConfiguration =0x3 ; -DBGPRINT (RT_DEBUG_TRACE , ("PSM : Force ASPM : Host device L1/L0s Value = 0x%x\n" , HostConfiguration)); +DBGPRINT (RT_DEBUG_TRACE , + ("PSM : Force ASPM : " +"Host device L1/L0s Value = 0x%lx\n" , + HostConfiguration)); } }else if (pAd->StaCfg.PSControl.field.rt30xxFollowHostASPM ==1 )
@@ -1141,7 +1143,10 @@ VOID RTMPrt3xSetPCIePowerLinkCtrl(PCI_REG_READ_WORD (pObj->parent_pci_dev, pAd->HostLnkCtrlOffset, HostConfiguration); pAd->Rt3xxHostLinkCtrl = HostConfiguration; HostConfiguration &=0x3 ; -DBGPRINT (RT_DEBUG_TRACE , ("PSM : Follow Host ASPM : Host device L1/L0s Value = 0x%x\n" , HostConfiguration)); +DBGPRINT (RT_DEBUG_TRACE , + ("PSM : Follow Host ASPM : " +"Host device L1/L0s Value = 0x%lx\n" , + HostConfiguration)); } } }
@@ -1155,8 +1160,10 @@ VOID RTMPrt3xSetPCIePowerLinkCtrl( pAd->RLnkCtrlOffset = pos +PCI_EXP_LNKCTL ;pci_read_config_word (pObj->pci_dev, pAd->RLnkCtrlOffset, ®16); Configuration =le2cpu16 (reg16); -DBGPRINT (RT_DEBUG_TRACE , ("Read (Ralink PCIe Link Control Register) offset 0x%x = 0x%x\n" , - pAd->RLnkCtrlOffset, Configuration)); +DBGPRINT (RT_DEBUG_TRACE , + ("Read (Ralink PCIe Link Control Register) " +"offset 0x%x = 0x%lx\n" , + pAd->RLnkCtrlOffset, Configuration)); Configuration |=0x100 ;if ((pAd->StaCfg.PSControl.field.rt30xxFollowHostASPM ==1 ) || (pAd->StaCfg.PSControl.field.rt30xxForceASPMTest ==1 ))
@@ -1182,7 +1189,9 @@ VOID RTMPrt3xSetPCIePowerLinkCtrl( reg16 =cpu2le16 (Configuration);pci_write_config_word (pObj->pci_dev, pAd->RLnkCtrlOffset, reg16); pAd->Rt3xxRalinkLinkCtrl = Configuration; -DBGPRINT (RT_DEBUG_TRACE , ("PSM :Write Ralink device L1/L0s Value = 0x%x\n" , Configuration)); +DBGPRINT (RT_DEBUG_TRACE , + ("PSM :Write Ralink device L1/L0s Value = 0x%lx\n" , + Configuration)); }DBGPRINT (RT_DEBUG_INFO ,("PSM :RTMPrt3xSetPCIePowerLinkCtrl <==============\n" )); }
drivers/staging/rt2860/rt_linux.c +4 -6
@@ -965,6 +965,7 @@ err_free_sk_buff:*******************************************************************************/ int RtmpOSIRQRequest(IN PNET_DEV pNetDev) { +#ifdef RTMP_PCI_SUPPORT struct net_device *net_dev = pNetDev;PRTMP_ADAPTER pAd =NULL ;int retval =0 ;
@@ -973,7 +974,6 @@ int RtmpOSIRQRequest(IN PNET_DEV pNetDevASSERT (pAd); -#ifdef RTMP_PCI_SUPPORT if (pAd->infType ==RTMP_DEV_INF_PCI ) {POS_COOKIE _pObj = (POS_COOKIE )(pAd->OS_Cookie);
@@ -982,14 +982,13 @@ int RtmpOSIRQRequest(IN PNET_DEV pNetDevif (retval !=0 )printk ("RT2860: request_irq ERROR(%d)\n" , retval); } -#endif // RTMP_PCI_SUPPORT // -return retval; - +#else +return 0 ; +#endif } - int RtmpOSIRQRelease(IN PNET_DEV pNetDev) {struct net_device *net_dev = pNetDev;
@@ -1149,7 +1148,6 @@ NDIS_STATUS RtmpOSTaskAttach( IN void *arg) {NDIS_STATUS status =NDIS_STATUS_SUCCESS ; -pid_t pid_number =-1 ;#ifdef KTHREAD_SUPPORT pTask->task_killed =0 ;
drivers/staging/rt2860/rt_main_dev.c +2 -4
@@ -209,15 +209,13 @@ int rt28xx_close(IN PNET_DEV dev)BOOLEAN Cancelled;UINT32 i =0 ; -GET_PAD_FROM_NET_DEV (pAd, net_dev); -#ifdef RTMP_MAC_USB DECLARE_WAIT_QUEUE_HEAD (unlink_wakeup);DECLARE_WAITQUEUE (wait, current); - -//RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_REMOVE_IN_PROGRESS); #endif // RTMP_MAC_USB // +GET_PAD_FROM_NET_DEV (pAd, net_dev); +DBGPRINT (RT_DEBUG_TRACE , ("===> rt28xx_close\n" )); Cancelled = FALSE;
drivers/staging/rt2860/sta/connect.c +0 -1
@@ -1809,7 +1809,6 @@ VOID LinkDown( IN BOOLEAN IsReqFromAP) {UCHAR i, ByteValue =0 ; -BOOLEAN Cancelled;// Do nothing if monitor mode is on if (MONITOR_ON (pAd))
drivers/staging/rt2860/usb_main_dev.c +4 -3
@@ -686,9 +686,10 @@ VOID RTUSBWatchDog(IN RTMP_ADAPTER *pAd)RTMP_IRQ_UNLOCK (&pAd->BulkOutLock[idx], irqFlags); - -printk ("%d:%d LTL=%d , TL=%d L:%d\n" ,idx,pAd->watchDogTxPendingCnt[idx],pAd->TransferedLength[idx] - ,actual_length,transfer_buffer_length); +printk (KERN_INFO "%d:%lu LTL=%d , TL=%d L:%d\n" , + idx, pAd->watchDogTxPendingCnt[idx], + pAd->TransferedLength[idx], + actual_length, transfer_buffer_length);if (pUrb) {