Staging: vt6655: remove custom UINT typedef (b6e95cd5) · Commits · e / devices / android_kernel_teracube_2e

drivers/staging/vt6655/80211mgr.h

+24 −24

Original line number	Diff line number	Diff line
		@@ -495,8 +495,8 @@ typedef struct _WLAN_IE_IBSS_DFS {
		// prototype structure, all mgmt frame types will start with these members
		typedef struct tagWLAN_FR_MGMT {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;

		@@ -505,8 +505,8 @@ typedef struct tagWLAN_FR_MGMT {
		// Beacon frame
		typedef struct tagWLAN_FR_BEACON {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		// fixed fields
		@@ -537,8 +537,8 @@ typedef struct tagWLAN_FR_BEACON {
		// IBSS ATIM frame
		typedef struct tagWLAN_FR_IBSSATIM {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;

		@@ -551,8 +551,8 @@ typedef struct tagWLAN_FR_IBSSATIM {
		// Disassociation
		typedef struct tagWLAN_FR_DISASSOC {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -564,8 +564,8 @@ typedef struct tagWLAN_FR_DISASSOC {
		// Association Request
		typedef struct tagWLAN_FR_ASSOCREQ {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -585,8 +585,8 @@ typedef struct tagWLAN_FR_ASSOCREQ {
		// Association Response
		typedef struct tagWLAN_FR_ASSOCRESP {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -602,8 +602,8 @@ typedef struct tagWLAN_FR_ASSOCRESP {
		// Reassociation Request
		typedef struct tagWLAN_FR_REASSOCREQ {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;

		@@ -624,8 +624,8 @@ typedef struct tagWLAN_FR_REASSOCREQ {
		// Reassociation Response
		typedef struct tagWLAN_FR_REASSOCRESP {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -641,8 +641,8 @@ typedef struct tagWLAN_FR_REASSOCRESP {
		// Probe Request
		typedef struct tagWLAN_FR_PROBEREQ {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -656,8 +656,8 @@ typedef struct tagWLAN_FR_PROBEREQ {
		// Probe Response
		typedef struct tagWLAN_FR_PROBERESP {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -685,8 +685,8 @@ typedef struct tagWLAN_FR_PROBERESP {
		// Authentication
		typedef struct tagWLAN_FR_AUTHEN {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/
		@@ -701,8 +701,8 @@ typedef struct tagWLAN_FR_AUTHEN {
		// Deauthenication
		typedef struct tagWLAN_FR_DEAUTHEN {

		UINT uType;
		UINT len;
		unsigned int uType;
		unsigned int len;
		PBYTE pBuf;
		PUWLAN_80211HDR pHdr;
		/-- fixed fields -----------/

drivers/staging/vt6655/IEEE11h.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -97,7 +97,8 @@ typedef struct _WLAN_FRAME_TPCREP {
		/--------------------- Static Variables --------------------------/

		/--------------------- Static Functions --------------------------/
		static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, UINT uLength)
		static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,
		unsigned int uLength)
		{
		size_t uNumOfEIDs = 0;
		BOOL bResult = TRUE;
		@@ -209,7 +210,7 @@ IEEE11hbMgrRxAction (
		{
		PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
		PWLAN_FRAME_ACTION pAction = NULL;
		UINT uLength = 0;
		unsigned int uLength = 0;
		PWLAN_IE_CH_SW pChannelSwitch = NULL;

drivers/staging/vt6655/baseband.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -1776,19 +1776,19 @@ s_vChangeAntenna (
		* Return Value: FrameTime
		*
		*/
		UINT
		unsigned int
		BBuGetFrameTime (
		BYTE byPreambleType,
		BYTE byPktType,
		UINT cbFrameLength,
		unsigned int cbFrameLength,
		WORD wRate
		)
		{
		UINT uFrameTime;
		UINT uPreamble;
		UINT uTmp;
		UINT uRateIdx = (UINT)wRate;
		UINT uRate = 0;
		unsigned int uFrameTime;
		unsigned int uPreamble;
		unsigned int uTmp;
		unsigned int uRateIdx = (unsigned int) wRate;
		unsigned int uRate = 0;


		if (uRateIdx > RATE_54M) {
		@@ -1796,7 +1796,7 @@ BBuGetFrameTime (
		return 0;
		}

		uRate = (UINT)awcFrameTime[uRateIdx];
		uRate = (unsigned int) awcFrameTime[uRateIdx];

		if (uRateIdx <= 3) { //CCK mode

		@@ -1846,7 +1846,7 @@ BBuGetFrameTime (
		void
		BBvCaculateParameter (
		PSDevice pDevice,
		UINT cbFrameLength,
		unsigned int cbFrameLength,
		WORD wRate,
		BYTE byPacketType,
		PWORD pwPhyLen,
		@@ -1854,9 +1854,9 @@ BBvCaculateParameter (
		PBYTE pbyPhySgn
		)
		{
		UINT cbBitCount;
		UINT cbUsCount = 0;
		UINT cbTmp;
		unsigned int cbBitCount;
		unsigned int cbUsCount = 0;
		unsigned int cbTmp;
		BOOL bExtBit;
		BYTE byPreambleType = pDevice->byPreambleType;
		BOOL bCCK = pDevice->bCCK;
		@@ -2762,7 +2762,7 @@ ULONG ulPacketNum;
		void
		BBvClearAntDivSQ3Value (PSDevice pDevice)
		{
		UINT ii;
		unsigned int ii;

		pDevice->uDiversityCnt = 0;
		for (ii = 0; ii < MAX_RATE; ii++) {

drivers/staging/vt6655/baseband.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -118,18 +118,18 @@

		/--------------------- Export Functions --------------------------/

		UINT
		unsigned int
		BBuGetFrameTime(
		BYTE byPreambleType,
		BYTE byPktType,
		UINT cbFrameLength,
		unsigned int cbFrameLength,
		WORD wRate
		);

		void
		BBvCaculateParameter (
		PSDevice pDevice,
		UINT cbFrameLength,
		unsigned int cbFrameLength,
		WORD wRate,
		BYTE byPacketType,
		PWORD pwPhyLen,

drivers/staging/vt6655/bssdb.c

+33 −33

Original line number	Diff line number	Diff line
		@@ -138,8 +138,8 @@ BSSpSearchBSSList(
		PKnownBSS pCurrBSS = NULL;
		PKnownBSS pSelect = NULL;
		BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
		UINT ii = 0;
		// UINT jj = 0; //DavidWang
		unsigned int ii = 0;

		if (pbyDesireBSSID != NULL) {
		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",
		pbyDesireBSSID,(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
		@@ -288,7 +288,7 @@ BSSvClearBSSList(
		{
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		UINT ii;
		unsigned int ii;

		for (ii = 0; ii < MAX_BSS_NUM; ii++) {
		if (bKeepCurrBSSID) {
		@@ -333,7 +333,7 @@ BSSpAddrIsInBSSList(
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		PKnownBSS pBSSList = NULL;
		UINT ii;
		unsigned int ii;

		for (ii = 0; ii < MAX_BSS_NUM; ii++) {
		pBSSList = &(pMgmt->sBSSList[ii]);
		@@ -382,7 +382,7 @@ BSSbInsertToBSSList (
		PWLAN_IE_RSN_EXT pRSNWPA,
		PWLAN_IE_COUNTRY pIE_Country,
		PWLAN_IE_QUIET pIE_Quiet,
		UINT uIELength,
		unsigned int uIELength,
		PBYTE pbyIEs,
		void *pRxPacketContext
		)
		@@ -392,7 +392,7 @@ BSSbInsertToBSSList (
		PSMgmtObject pMgmt = pDevice->pMgmt;
		PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
		PKnownBSS pBSSList = NULL;
		UINT ii;
		unsigned int ii;
		BOOL bParsingQuiet = FALSE;
		PWLAN_IE_QUIET pQuiet = NULL;

		@@ -468,9 +468,9 @@ BSSbInsertToBSSList (
		WPA_ClearRSN(pBSSList);

		if (pRSNWPA != NULL) {
		UINT uLen = pRSNWPA->len + 2;
		unsigned int uLen = pRSNWPA->len + 2;

		if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
		if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
		pBSSList->wWPALen = uLen;
		memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
		WPA_ParseRSN(pBSSList, pRSNWPA);
		@@ -480,8 +480,8 @@ BSSbInsertToBSSList (
		WPA2_ClearRSN(pBSSList);

		if (pRSN != NULL) {
		UINT uLen = pRSN->len + 2;
		if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
		unsigned int uLen = pRSN->len + 2;
		if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
		pBSSList->wRSNLen = uLen;
		memcpy(pBSSList->byRSNIE, pRSN, uLen);
		WPA2vParseRSN(pBSSList, pRSN);
		@@ -600,7 +600,7 @@ BSSbUpdateToBSSList (
		PWLAN_IE_COUNTRY pIE_Country,
		PWLAN_IE_QUIET pIE_Quiet,
		PKnownBSS pBSSList,
		UINT uIELength,
		unsigned int uIELength,
		PBYTE pbyIEs,
		void *pRxPacketContext
		)
		@@ -670,8 +670,8 @@ BSSbUpdateToBSSList (
		WPA_ClearRSN(pBSSList); //mike update

		if (pRSNWPA != NULL) {
		UINT uLen = pRSNWPA->len + 2;
		if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
		unsigned int uLen = pRSNWPA->len + 2;
		if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
		pBSSList->wWPALen = uLen;
		memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
		WPA_ParseRSN(pBSSList, pRSNWPA);
		@@ -681,8 +681,8 @@ BSSbUpdateToBSSList (
		WPA2_ClearRSN(pBSSList); //mike update

		if (pRSN != NULL) {
		UINT uLen = pRSN->len + 2;
		if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
		unsigned int uLen = pRSN->len + 2;
		if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
		pBSSList->wRSNLen = uLen;
		memcpy(pBSSList->byRSNIE, pRSN, uLen);
		WPA2vParseRSN(pBSSList, pRSN);
		@@ -770,7 +770,7 @@ BSSDBbIsSTAInNodeDB(
		)
		{
		PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
		UINT ii;
		unsigned int ii;

		// Index = 0 reserved for AP Node
		for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
		@@ -806,9 +806,9 @@ BSSvCreateOneNode(

		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		UINT ii;
		UINT BigestCount = 0;
		UINT SelectIndex;
		unsigned int ii;
		unsigned int BigestCount = 0;
		unsigned int SelectIndex;
		struct sk_buff *skb;
		// Index = 0 reserved for AP Node (In STA mode)
		// Index = 0 reserved for Broadcast/MultiCast (In AP mode)
		@@ -865,7 +865,7 @@ BSSvCreateOneNode(
		void
		BSSvRemoveOneNode(
		void *hDeviceContext,
		UINT uNodeIndex
		unsigned int uNodeIndex
		)
		{

		@@ -905,7 +905,7 @@ BSSvUpdateAPNode(
		{
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		UINT uRateLen = WLAN_RATES_MAXLEN;
		unsigned int uRateLen = WLAN_RATES_MAXLEN;

		memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));

		@@ -1009,7 +1009,7 @@ BSSvAddMulticastNode(
		//2008-4-14 <add> by chester for led issue
		#ifdef FOR_LED_ON_NOTEBOOK
		BOOL cc=FALSE;
		UINT status;
		unsigned int status;
		#endif
		void
		BSSvSecondCallBack(
		@@ -1018,11 +1018,11 @@ BSSvSecondCallBack(
		{
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		UINT ii;
		unsigned int ii;
		PWLAN_IE_SSID pItemSSID, pCurrSSID;
		UINT uSleepySTACnt = 0;
		UINT uNonShortSlotSTACnt = 0;
		UINT uLongPreambleSTACnt = 0;
		unsigned int uSleepySTACnt = 0;
		unsigned int uNonShortSlotSTACnt = 0;
		unsigned int uLongPreambleSTACnt = 0;
		viawget_wpa_header* wpahdr; //DavidWang

		spin_lock_irq(&pDevice->lock);
		@@ -1394,20 +1394,20 @@ BSSvUpdateNodeTxCounter(
		BYTE byTsr0,
		BYTE byTsr1,
		PBYTE pbyBuffer,
		UINT uFIFOHeaderSize
		unsigned int uFIFOHeaderSize
		)
		{
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		UINT uNodeIndex = 0;
		unsigned int uNodeIndex = 0;
		BYTE byTxRetry = (byTsr0 & TSR0_NCR);
		PSTxBufHead pTxBufHead;
		PS802_11Header pMACHeader;
		WORD wRate;
		WORD wFallBackRate = RATE_1M;
		BYTE byFallBack;
		UINT ii;
		// UINT txRetryTemp;
		unsigned int ii;
		// unsigned int txRetryTemp;
		//PLICE_DEBUG->
		//txRetryTemp = byTxRetry;
		//if (txRetryTemp== 8)
		@@ -1584,14 +1584,14 @@ BSSvUpdateNodeTxCounter(
		void
		BSSvClearNodeDBTable(
		void *hDeviceContext,
		UINT uStartIndex
		unsigned int uStartIndex
		)

		{
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		struct sk_buff *skb;
		UINT ii;
		unsigned int ii;

		for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) {
		if (pMgmt->sNodeDBTable[ii].bActive) {
		@@ -1666,7 +1666,7 @@ BSSvClearAnyBSSJoinRecord (
		{
		PSDevice pDevice = (PSDevice)hDeviceContext;
		PSMgmtObject pMgmt = pDevice->pMgmt;
		UINT ii;
		unsigned int ii;

		for (ii = 0; ii < MAX_BSS_NUM; ii++) {
		pMgmt->sBSSList[ii].bSelected = FALSE;