Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dbc77c0 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: 64 bit fixes: MACvSetKeyEntry correct sizeof long, 



Use u32 to correct the pointer of pdwKey and the size of dwData.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 829127b4

drivers/staging/vt6655/key.c

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ bool KeybSetKey( 
				if (uKeyLength == WLAN_WEP104_KEYLEN)

					pKey->abyKey[15] |= 0x80;

			}

			MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pbyBSSID, (unsigned long *)pKey->abyKey, byLocalID);

			MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pbyBSSID, (u32 *)pKey->abyKey, byLocalID);



			if ((dwKeyIndex & USE_KEYRSC) == 0) {

				// RSC set by NIC
@@ -306,7 +306,7 @@ bool KeybSetKey( 
			if (uKeyLength == WLAN_WEP104_KEYLEN)

				pKey->abyKey[15] |= 0x80;

		}

		MACvSetKeyEntry(dwIoBase, pTable->KeyTable[j].wKeyCtl, j, uKeyIdx, pbyBSSID, (unsigned long *)pKey->abyKey, byLocalID);

		MACvSetKeyEntry(dwIoBase, pTable->KeyTable[j].wKeyCtl, j, uKeyIdx, pbyBSSID, (u32 *)pKey->abyKey, byLocalID);



		if ((dwKeyIndex & USE_KEYRSC) == 0) {

			// RSC set by NIC
@@ -670,7 +670,7 @@ bool KeybSetDefaultKey( 
		if (uKeyLength == WLAN_WEP104_KEYLEN)

			pKey->abyKey[15] |= 0x80;

	}

	MACvSetKeyEntry(dwIoBase, pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl, MAX_KEY_TABLE-1, uKeyIdx, pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, (unsigned long *)pKey->abyKey, byLocalID);

	MACvSetKeyEntry(dwIoBase, pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl, MAX_KEY_TABLE-1, uKeyIdx, pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, (u32 *)pKey->abyKey, byLocalID);



	if ((dwKeyIndex & USE_KEYRSC) == 0) {

		// RSC set by NIC
@@ -766,7 +766,7 @@ bool KeybSetAllGroupKey( 
				if (uKeyLength == WLAN_WEP104_KEYLEN)

					pKey->abyKey[15] |= 0x80;

			}

			MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pTable->KeyTable[i].abyBSSID, (unsigned long *)pKey->abyKey, byLocalID);

			MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pTable->KeyTable[i].abyBSSID, (u32 *)pKey->abyKey, byLocalID);



			if ((dwKeyIndex & USE_KEYRSC) == 0) {

				// RSC set by NIC

drivers/staging/vt6655/mac.c

+5 −5
Original line number Diff line number Diff line
@@ -1428,10 +1428,10 @@ bool MACbPSWakeup(unsigned long dwIoBase) 
 */



void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx,

		     unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, unsigned char byLocalID)

		     unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey, unsigned char byLocalID)

{

	unsigned short wOffset;

	unsigned long dwData;

	u32 dwData;

	int     ii;



	if (byLocalID <= 1)
@@ -1445,7 +1445,7 @@ void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned in 
	dwData |= wKeyCtl;

	dwData <<= 16;

	dwData |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5));

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData, wKeyCtl);

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "1. wOffset: %d, Data: %X, KeyCtl:%X\n", wOffset, dwData, wKeyCtl);



	VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);

	VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
@@ -1460,7 +1460,7 @@ void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned in 
	dwData |= *(pbyAddr+1);

	dwData <<= 8;

	dwData |= *(pbyAddr+0);

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "2. wOffset: %d, Data: %lX\n", wOffset, dwData);

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "2. wOffset: %d, Data: %X\n", wOffset, dwData);



	VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);

	VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
@@ -1470,7 +1470,7 @@ void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned in 
	wOffset += (uKeyIdx * 4);

	for (ii = 0; ii < 4; ii++) {

		// always push 128 bits

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "3.(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey);

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "3.(%d) wOffset: %d, Data: %X\n", ii, wOffset+ii, *pdwKey);

		VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii);

		VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++);

		VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);

drivers/staging/vt6655/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -1038,7 +1038,7 @@ bool MACbFlushSYNCFifo(unsigned long dwIoBase); 
bool MACbPSWakeup(unsigned long dwIoBase);



void MACvSetKeyEntry(unsigned long dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx,

		     unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, unsigned char byLocalID);

		     unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey, unsigned char byLocalID);

void MACvDisableKeyEntry(unsigned long dwIoBase, unsigned int uEntryIdx);

void MACvSetDefaultKeyEntry(unsigned long dwIoBase, unsigned int uKeyLen,

			    unsigned int uKeyIdx, unsigned long *pdwKey, unsigned char byLocalID);