|
@@ -235,7 +235,8 @@ BOOL KeybSetKey(
|
|
|
PSKeyItem pKey;
|
|
|
unsigned int uKeyIdx;
|
|
|
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
|
|
|
+ "Enter KeybSetKey: %X\n", dwKeyIndex);
|
|
|
|
|
|
j = (MAX_KEY_TABLE-1);
|
|
|
for (i=0;i<(MAX_KEY_TABLE-1);i++) {
|
|
@@ -261,7 +262,9 @@ BOOL KeybSetKey(
|
|
|
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
|
|
|
// Group transmit key
|
|
|
pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
|
|
|
+ "Group transmit key(R)[%X]: %d\n",
|
|
|
+ pTable->KeyTable[i].dwGTKeyIndex, i);
|
|
|
}
|
|
|
pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed
|
|
|
pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4);
|
|
@@ -302,9 +305,12 @@ BOOL KeybSetKey(
|
|
|
}
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
|
|
|
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
|
|
|
+ pKey->dwTSC47_16);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ",
|
|
|
+ pKey->wTSC15_0);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
|
|
|
+ pKey->dwKeyIndex);
|
|
|
|
|
|
return (TRUE);
|
|
|
}
|
|
@@ -326,7 +332,9 @@ BOOL KeybSetKey(
|
|
|
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
|
|
|
// Group transmit key
|
|
|
pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex;
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
|
|
|
+ "Group transmit key(N)[%X]: %d\n",
|
|
|
+ pTable->KeyTable[j].dwGTKeyIndex, j);
|
|
|
}
|
|
|
pTable->KeyTable[j].wKeyCtl &= 0xFF0F; // clear group key control filed
|
|
|
pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4);
|
|
@@ -367,9 +375,11 @@ BOOL KeybSetKey(
|
|
|
}
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
|
|
|
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
|
|
|
+ pKey->dwTSC47_16);
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
|
|
|
+ pKey->dwKeyIndex);
|
|
|
|
|
|
return (TRUE);
|
|
|
}
|
|
@@ -597,7 +607,8 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
|
|
|
}
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %X\n",
|
|
|
+ pTable->KeyTable[i].dwGTKeyIndex);
|
|
|
|
|
|
return (TRUE);
|
|
|
}
|
|
@@ -696,7 +707,10 @@ BOOL KeybSetDefaultKey(
|
|
|
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
|
|
|
// Group transmit key
|
|
|
pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex;
|
|
|
- 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);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
|
|
|
+ "Group transmit key(R)[%X]: %d\n",
|
|
|
+ pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex,
|
|
|
+ MAX_KEY_TABLE-1);
|
|
|
|
|
|
}
|
|
|
pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00; // clear all key control filed
|
|
@@ -747,9 +761,11 @@ BOOL KeybSetDefaultKey(
|
|
|
}
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
|
|
|
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n",
|
|
|
+ pKey->dwTSC47_16);
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0);
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n",
|
|
|
+ pKey->dwKeyIndex);
|
|
|
|
|
|
return (TRUE);
|
|
|
}
|
|
@@ -787,7 +803,8 @@ BOOL KeybSetAllGroupKey(
|
|
|
PSKeyItem pKey;
|
|
|
unsigned int uKeyIdx;
|
|
|
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %X\n",
|
|
|
+ dwKeyIndex);
|
|
|
|
|
|
|
|
|
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
|
|
@@ -804,7 +821,9 @@ BOOL KeybSetAllGroupKey(
|
|
|
if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
|
|
|
// Group transmit key
|
|
|
pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
|
|
|
+ "Group transmit key(R)[%X]: %d\n",
|
|
|
+ pTable->KeyTable[i].dwGTKeyIndex, i);
|
|
|
|
|
|
}
|
|
|
pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed
|