summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/key.c
diff options
context:
space:
mode:
authorJoe Perches2013-03-19 04:55:41 +0100
committerGreg Kroah-Hartman2013-03-25 19:16:17 +0100
commit96d69e201bbdb05c363e899138f9f42bc8ad8f88 (patch)
treef3ba7f8c5436cfbce1617f415febbd681fe78fd4 /drivers/staging/vt6655/key.c
parentstaging: vt6655: Fix macro definitions (diff)
downloadkernel-qcow2-linux-96d69e201bbdb05c363e899138f9f42bc8ad8f88.tar.gz
kernel-qcow2-linux-96d69e201bbdb05c363e899138f9f42bc8ad8f88.tar.xz
kernel-qcow2-linux-96d69e201bbdb05c363e899138f9f42bc8ad8f88.zip
staging: vt6655: Remove unnecessary blank lines
Remove a bunch of useless vertical whitespace. Convert 3 or more consecutive newlines to 2. Remove blank lines after open brace and before close brace. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/key.c')
-rw-r--r--drivers/staging/vt6655/key.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index d2b5d625293b..92b84b5ea115 100644
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -71,7 +71,6 @@ s_vCheckKeyTableValid(PSKeyManagement pTable, unsigned long dwIoBase)
(pTable->KeyTable[i].GroupKey[2].bKeyValid == false) &&
(pTable->KeyTable[i].GroupKey[3].bKeyValid == false)
) {
-
pTable->KeyTable[i].bInUse = false;
pTable->KeyTable[i].wKeyCtl = 0;
pTable->KeyTable[i].bSoftWEP = false;
@@ -80,10 +79,8 @@ s_vCheckKeyTableValid(PSKeyManagement pTable, unsigned long dwIoBase)
}
}
-
/*--------------------- Export Functions --------------------------*/
-
/*
* Description: Init Key management table
*
@@ -116,7 +113,6 @@ void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase)
}
}
-
/*
* Description: Get Key from table
*
@@ -168,7 +164,6 @@ bool KeybGetKey(
return false;
}
-
/*
* Description: Set Key to table
*
@@ -342,7 +337,6 @@ bool KeybSetKey(
return false;
}
-
/*
* Description: Remove Key from table
*
@@ -412,7 +406,6 @@ bool KeybRemoveKey(
return false;
}
-
/*
* Description: Remove Key from table
*
@@ -467,7 +460,6 @@ void KeyvRemoveWEPKey(
unsigned long dwIoBase
)
{
-
if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == true) {
if (pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].byCipherSuite == KEY_CTL_WEP) {
@@ -521,9 +513,7 @@ bool KeybGetTransmitKey(
for (i = 0; i < MAX_KEY_TABLE; i++) {
if ((pTable->KeyTable[i].bInUse == true) &&
!compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
-
if (dwKeyType == PAIRWISE_KEY) {
-
if (pTable->KeyTable[i].PairwiseKey.bKeyValid == true) {
*pKey = &(pTable->KeyTable[i].PairwiseKey);
@@ -534,7 +524,6 @@ bool KeybGetTransmitKey(
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "\n");
-
return true;
} else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PairwiseKey.bKeyValid == false\n");
@@ -573,7 +562,6 @@ bool KeybGetTransmitKey(
return false;
}
-
/*
* Description: Check Pairewise Key
*
@@ -637,7 +625,6 @@ bool KeybSetDefaultKey(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength);
-
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
return false;
} else if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) {
@@ -696,7 +683,6 @@ bool KeybSetDefaultKey(
pKey->dwTSC47_16 = 0;
pKey->wTSC15_0 = 0;
-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybSetKey(R): \n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pKey->bKeyValid: %d\n", pKey->bKeyValid);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pKey->uKeyLength: %d\n", (int)pKey->uKeyLength);
@@ -713,7 +699,6 @@ bool KeybSetDefaultKey(
return true;
}
-
/*
* Description: Set Key to table
*
@@ -748,7 +733,6 @@ bool KeybSetAllGroupKey(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
-
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
return false;
} else if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) {