Commit f6804f33 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rxtx.c s_vFillTxKey use switch for pTransmitKey->byCipherSuite

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95bfb1ae
...@@ -198,7 +198,8 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf, ...@@ -198,7 +198,8 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
*pdwIV = pDevice->dwIVCounter; *pdwIV = pDevice->dwIVCounter;
pDevice->byKeyIndex = pTransmitKey->dwKeyIndex & 0xf; pDevice->byKeyIndex = pTransmitKey->dwKeyIndex & 0xf;
if (pTransmitKey->byCipherSuite == KEY_CTL_WEP) { switch (pTransmitKey->byCipherSuite) {
case KEY_CTL_WEP:
if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN) { if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN) {
memcpy(pDevice->abyPRNG, (u8 *)&dwRevIVCounter, 3); memcpy(pDevice->abyPRNG, (u8 *)&dwRevIVCounter, 3);
memcpy(pDevice->abyPRNG + 3, pTransmitKey->abyKey, memcpy(pDevice->abyPRNG + 3, pTransmitKey->abyKey,
...@@ -223,7 +224,9 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf, ...@@ -223,7 +224,9 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
pDevice->dwIVCounter++; pDevice->dwIVCounter++;
if (pDevice->dwIVCounter > WEP_IV_MASK) if (pDevice->dwIVCounter > WEP_IV_MASK)
pDevice->dwIVCounter = 0; pDevice->dwIVCounter = 0;
} else if (pTransmitKey->byCipherSuite == KEY_CTL_TKIP) {
break;
case KEY_CTL_TKIP:
pTransmitKey->wTSC15_0++; pTransmitKey->wTSC15_0++;
if (pTransmitKey->wTSC15_0 == 0) if (pTransmitKey->wTSC15_0 == 0)
pTransmitKey->dwTSC47_16++; pTransmitKey->dwTSC47_16++;
...@@ -244,7 +247,8 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf, ...@@ -244,7 +247,8 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u8 *pbyBuf,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"vFillTxKey()---- pdwExtIV: %x\n", *pdwExtIV); "vFillTxKey()---- pdwExtIV: %x\n", *pdwExtIV);
} else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) { break;
case KEY_CTL_CCMP:
pTransmitKey->wTSC15_0++; pTransmitKey->wTSC15_0++;
if (pTransmitKey->wTSC15_0 == 0) if (pTransmitKey->wTSC15_0 == 0)
pTransmitKey->dwTSC47_16++; pTransmitKey->dwTSC47_16++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment