Commit 95bfb1ae authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rxtx.c s_vFillTxKey clean up format and white space. 



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

drivers/staging/vt6656/rxtx.c

+93 −82
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf, 
	struct ieee80211_hdr *pMACHeader = (struct ieee80211_hdr *)pbyHdrBuf;

	u32 dwRevIVCounter;



    //Fill TXKEY

	/* Fill TXKEY */

	if (pTransmitKey == NULL)

		return;
@@ -200,54 +200,65 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf, 


	if (pTransmitKey->byCipherSuite == KEY_CTL_WEP) {

		if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN) {

            memcpy(pDevice->abyPRNG, (u8 *)&(dwRevIVCounter), 3);

            memcpy(pDevice->abyPRNG+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength);

			memcpy(pDevice->abyPRNG, (u8 *)&dwRevIVCounter, 3);

			memcpy(pDevice->abyPRNG + 3, pTransmitKey->abyKey,

						pTransmitKey->uKeyLength);

		} else {

            memcpy(pbyBuf, (u8 *)&(dwRevIVCounter), 3);

            memcpy(pbyBuf+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength);

			memcpy(pbyBuf, (u8 *)&dwRevIVCounter, 3);

			memcpy(pbyBuf + 3, pTransmitKey->abyKey,

						pTransmitKey->uKeyLength);

			if (pTransmitKey->uKeyLength == WLAN_WEP40_KEYLEN) {

                memcpy(pbyBuf+8, (u8 *)&(dwRevIVCounter), 3);

                memcpy(pbyBuf+11, pTransmitKey->abyKey, pTransmitKey->uKeyLength);

				memcpy(pbyBuf+8, (u8 *)&dwRevIVCounter, 3);

			memcpy(pbyBuf+11, pTransmitKey->abyKey,

						pTransmitKey->uKeyLength);

			}



			memcpy(pDevice->abyPRNG, pbyBuf, 16);

		}

        // Append IV after Mac Header

        *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111

		/* Append IV after Mac Header */

		*pdwIV &= WEP_IV_MASK;

		*pdwIV |= (u32)pDevice->byKeyIndex << 30;

		*pdwIV = cpu_to_le32(*pdwIV);



		pDevice->dwIVCounter++;

        if (pDevice->dwIVCounter > WEP_IV_MASK) {

		if (pDevice->dwIVCounter > WEP_IV_MASK)

			pDevice->dwIVCounter = 0;

        }

	} else if (pTransmitKey->byCipherSuite == KEY_CTL_TKIP) {

		pTransmitKey->wTSC15_0++;

        if (pTransmitKey->wTSC15_0 == 0) {

		if (pTransmitKey->wTSC15_0 == 0)

			pTransmitKey->dwTSC47_16++;

        }



		TKIPvMixKey(pTransmitKey->abyKey, pDevice->abyCurrentNetAddr,

                    pTransmitKey->wTSC15_0, pTransmitKey->dwTSC47_16, pDevice->abyPRNG);

			pTransmitKey->wTSC15_0, pTransmitKey->dwTSC47_16,

							pDevice->abyPRNG);

		memcpy(pbyBuf, pDevice->abyPRNG, 16);

        // Make IV



		/* Make IV */

		memcpy(pdwIV, pDevice->abyPRNG, 3);



        *(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV

        // Append IV&ExtIV after Mac Header

		*(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) &

							0xc0) | 0x20);

		/*  Append IV&ExtIV after Mac Header */

		*pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n",

		*pdwExtIV);



		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

			"vFillTxKey()---- pdwExtIV: %x\n", *pdwExtIV);



	} else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) {

		pTransmitKey->wTSC15_0++;

        if (pTransmitKey->wTSC15_0 == 0) {

		if (pTransmitKey->wTSC15_0 == 0)

			pTransmitKey->dwTSC47_16++;

        }



		memcpy(pbyBuf, pTransmitKey->abyKey, 16);



        // Make IV

		/* Make IV */

		*pdwIV = 0;

        *(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV

		*(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) &

							0xc0) | 0x20);



		*pdwIV |= cpu_to_le16((u16)(pTransmitKey->wTSC15_0));

        //Append IV&ExtIV after Mac Header



		/* Append IV&ExtIV after Mac Header */

		*pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);



		if (!mic_hdr)