From: Malcolm Priestley Date: Sat, 22 Mar 2014 09:01:23 +0000 (+0000) Subject: staging: vt6656: rxtx.c: s_vFillTxKey Replace dwRevIVCounter X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~1386 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fbfaccff4f522260ca1ce859a9ca63f96c2256a7;p=firefly-linux-kernel-4.4.55.git staging: vt6656: rxtx.c: s_vFillTxKey Replace dwRevIVCounter Fix base type to __le32 and remove camel case. Camel case change dwRevIVCounter -> rev_iv_counter Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 3840323858fc..9f80a7a0d3a2 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -184,28 +184,28 @@ static void s_vFillTxKey(struct vnt_private *pDevice, u32 *pdwIV = (u32 *)pbyIVHead; u32 *pdwExtIV = (u32 *)((u8 *)pbyIVHead + 4); struct ieee80211_hdr *pMACHeader = (struct ieee80211_hdr *)pbyHdrBuf; - u32 dwRevIVCounter; + __le32 rev_iv_counter; /* Fill TXKEY */ if (pTransmitKey == NULL) return; - dwRevIVCounter = cpu_to_le32(pDevice->dwIVCounter); + rev_iv_counter = cpu_to_le32(pDevice->dwIVCounter); *pdwIV = pDevice->dwIVCounter; pDevice->byKeyIndex = pTransmitKey->dwKeyIndex & 0xf; switch (pTransmitKey->byCipherSuite) { case KEY_CTL_WEP: if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN) { - memcpy(pDevice->abyPRNG, (u8 *)&dwRevIVCounter, 3); + memcpy(pDevice->abyPRNG, (u8 *)&rev_iv_counter, 3); memcpy(pDevice->abyPRNG + 3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); } else { - memcpy(pbyBuf, (u8 *)&dwRevIVCounter, 3); + memcpy(pbyBuf, (u8 *)&rev_iv_counter, 3); memcpy(pbyBuf + 3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); if (pTransmitKey->uKeyLength == WLAN_WEP40_KEYLEN) { - memcpy(pbyBuf+8, (u8 *)&dwRevIVCounter, 3); + memcpy(pbyBuf+8, (u8 *)&rev_iv_counter, 3); memcpy(pbyBuf+11, pTransmitKey->abyKey, pTransmitKey->uKeyLength); }