Skip to content

Commit b4dc03a

Browse files
Malcolm Priestleygregkh
Malcolm Priestley
authored and
gregkh
committed
staging: vt6656: 64 bit fixes: fix long warning messages.
Fixes long warning messages from patch [PATCH 08/14] staging: vt6656: 64 bit fixes : correct all type sizes Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7730492 commit b4dc03a

File tree

4 files changed

+51
-24
lines changed

4 files changed

+51
-24
lines changed

‎drivers/staging/vt6656/dpc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ static BOOL s_bHandleRxEncryption (
12381238

12391239
PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
12401240
*pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
1241-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
1241+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
12421242
if (byDecMode == KEY_CTL_TKIP) {
12431243
*pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
12441244
} else {
@@ -1349,7 +1349,7 @@ static BOOL s_bHostWepRxEncryption (
13491349

13501350
PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
13511351
*pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
1352-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
1352+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
13531353

13541354
if (byDecMode == KEY_CTL_TKIP) {
13551355
*pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));

‎drivers/staging/vt6656/key.c‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ BOOL KeybSetKey(
235235
PSKeyItem pKey;
236236
unsigned int uKeyIdx;
237237

238-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
238+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
239+
"Enter KeybSetKey: %X\n", dwKeyIndex);
239240

240241
j = (MAX_KEY_TABLE-1);
241242
for (i=0;i<(MAX_KEY_TABLE-1);i++) {
@@ -261,7 +262,9 @@ BOOL KeybSetKey(
261262
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
262263
// Group transmit key
263264
pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
264-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
265+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
266+
"Group transmit key(R)[%X]: %d\n",
267+
pTable->KeyTable[i].dwGTKeyIndex, i);
265268
}
266269
pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed
267270
pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4);
@@ -302,9 +305,12 @@ BOOL KeybSetKey(
302305
}
303306
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
304307

305-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
306-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
307-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
308+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
309+
pKey->dwTSC47_16);
310+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ",
311+
pKey->wTSC15_0);
312+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
313+
pKey->dwKeyIndex);
308314

309315
return (TRUE);
310316
}
@@ -326,7 +332,9 @@ BOOL KeybSetKey(
326332
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
327333
// Group transmit key
328334
pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex;
329-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j);
335+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
336+
"Group transmit key(N)[%X]: %d\n",
337+
pTable->KeyTable[j].dwGTKeyIndex, j);
330338
}
331339
pTable->KeyTable[j].wKeyCtl &= 0xFF0F; // clear group key control filed
332340
pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4);
@@ -367,9 +375,11 @@ BOOL KeybSetKey(
367375
}
368376
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
369377

370-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
378+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
379+
pKey->dwTSC47_16);
371380
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
372-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
381+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
382+
pKey->dwKeyIndex);
373383

374384
return (TRUE);
375385
}
@@ -597,7 +607,8 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
597607
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
598608
}
599609
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
600-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex);
610+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %X\n",
611+
pTable->KeyTable[i].dwGTKeyIndex);
601612

602613
return (TRUE);
603614
}
@@ -696,7 +707,10 @@ BOOL KeybSetDefaultKey(
696707
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
697708
// Group transmit key
698709
pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex;
699-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex, MAX_KEY_TABLE-1);
710+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
711+
"Group transmit key(R)[%X]: %d\n",
712+
pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex,
713+
MAX_KEY_TABLE-1);
700714

701715
}
702716
pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00; // clear all key control filed
@@ -747,9 +761,11 @@ BOOL KeybSetDefaultKey(
747761
}
748762
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
749763

750-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16);
764+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n",
765+
pKey->dwTSC47_16);
751766
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0);
752-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex);
767+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n",
768+
pKey->dwKeyIndex);
753769

754770
return (TRUE);
755771
}
@@ -787,7 +803,8 @@ BOOL KeybSetAllGroupKey(
787803
PSKeyItem pKey;
788804
unsigned int uKeyIdx;
789805

790-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
806+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %X\n",
807+
dwKeyIndex);
791808

792809

793810
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
@@ -804,7 +821,9 @@ BOOL KeybSetAllGroupKey(
804821
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
805822
// Group transmit key
806823
pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
807-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
824+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
825+
"Group transmit key(R)[%X]: %d\n",
826+
pTable->KeyTable[i].dwGTKeyIndex, i);
808827

809828
}
810829
pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed

‎drivers/staging/vt6656/mac.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ BYTE pbyData[24];
260260
dwData1 <<= 16;
261261
dwData1 |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5));
262262

263-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
263+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %X,"\
264+
" KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
264265

265266
//VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
266267
//VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
@@ -277,7 +278,8 @@ BYTE pbyData[24];
277278
dwData2 <<= 8;
278279
dwData2 |= *(pbyAddr+0);
279280

280-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %lX\n", wOffset, dwData2);
281+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %X\n",
282+
wOffset, dwData2);
281283

282284
//VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
283285
//VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);

‎drivers/staging/vt6656/rxtx.c‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,8 @@ s_vFillTxKey (
375375
*(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
376376
// Append IV&ExtIV after Mac Header
377377
*pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
378-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %lx\n", *pdwExtIV);
378+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n",
379+
*pdwExtIV);
379380

380381
} else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) {
381382
pTransmitKey->wTSC15_0++;
@@ -1749,7 +1750,8 @@ s_bPacketToWirelessUsb(
17491750
MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12);
17501751
dwMIC_Priority = 0;
17511752
MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
1752-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
1753+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %X, %X\n",
1754+
dwMICKey0, dwMICKey1);
17531755

17541756
///////////////////////////////////////////////////////////////////
17551757

@@ -2631,7 +2633,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
26312633
MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12);
26322634
dwMIC_Priority = 0;
26332635
MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
2634-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
2636+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY:"\
2637+
" %X, %X\n", dwMICKey0, dwMICKey1);
26352638

26362639
uLength = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen;
26372640

@@ -2651,7 +2654,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
26512654

26522655
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize);
26532656
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderSize, uPadding, cbIVlen);
2654-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R);
2657+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%x, %x\n",
2658+
*pdwMIC_L, *pdwMIC_R);
26552659

26562660
}
26572661

@@ -3025,7 +3029,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
30253029
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"error: KEY is GTK!!~~\n");
30263030
}
30273031
else {
3028-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
3032+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
3033+
pTransmitKey->dwKeyIndex);
30293034
bNeedEncryption = TRUE;
30303035
}
30313036
}
@@ -3034,7 +3039,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
30343039
if (pDevice->bEnableHostWEP) {
30353040
if ((uNodeIndex != 0) &&
30363041
(pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) {
3037-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
3042+
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
3043+
pTransmitKey->dwKeyIndex);
30383044
bNeedEncryption = TRUE;
30393045
}
30403046
}

0 commit comments

Comments
 (0)