redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: vt6655: Fixed C99 // comment errors in wpactl.c

Browse source 
The following patch fixes the checkpatch.pl warning:
ERROR: do not use C99 // comments

Signed-off-by: Esra Altintas <es.altintas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Esra Altintas 2014-09-29 21:55:06 +03:00 committed by Greg Kroah-Hartman
parent f79b0d9c22
commit dab5aeebdd
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/staging/vt6655/wpactl.c
View file

@ -300,7 +300,7 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx,
else else
byKeyDecMode = KEY_CTL_WEP; byKeyDecMode = KEY_CTL_WEP;
// Fix HCT test that set 256 bits KEY and Ndis802_11Encryption3Enabled /* Fix HCT test that set 256 bits KEY and Ndis802_11Encryption3Enabled */
if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) { if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) {
if (param->u.wpa_key.key_len == MAX_KEY_LEN) if (param->u.wpa_key.key_len == MAX_KEY_LEN)
byKeyDecMode = KEY_CTL_TKIP; byKeyDecMode = KEY_CTL_TKIP;
@ -315,23 +315,23 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx,
byKeyDecMode = KEY_CTL_WEP; byKeyDecMode = KEY_CTL_WEP;
} }
// Check TKIP key length /* Check TKIP key length */
if ((byKeyDecMode == KEY_CTL_TKIP) && if ((byKeyDecMode == KEY_CTL_TKIP) &&
(param->u.wpa_key.key_len != MAX_KEY_LEN)) { (param->u.wpa_key.key_len != MAX_KEY_LEN)) {
// TKIP Key must be 256 bits /* TKIP Key must be 256 bits */
pr_debug("return- TKIP Key must be 256 bits!\n"); pr_debug("return- TKIP Key must be 256 bits!\n");
return -EINVAL; return -EINVAL;
} }
// Check AES key length /* Check AES key length */
if ((byKeyDecMode == KEY_CTL_CCMP) && if ((byKeyDecMode == KEY_CTL_CCMP) &&
(param->u.wpa_key.key_len != AES_KEY_LEN)) { (param->u.wpa_key.key_len != AES_KEY_LEN)) {
// AES Key must be 128 bits /* AES Key must be 128 bits */
return -EINVAL; return -EINVAL;
} }
// spin_lock_irq(&pDevice->lock); /* spin_lock_irq(&pDevice->lock); */
if (is_broadcast_ether_addr(&param->addr[0]) || (param->addr == NULL)) { if (is_broadcast_ether_addr(&param->addr[0]) || (param->addr == NULL)) {
// If is_broadcast_ether_addr, set the key as every key entry's group key. /* If is_broadcast_ether_addr, set the key as every key entry's group key. */
pr_debug("Groupe Key Assign\n"); pr_debug("Groupe Key Assign\n");
if (KeybSetAllGroupKey(&(pDevice->sKey), if (KeybSetAllGroupKey(&(pDevice->sKey),
@ -358,14 +358,14 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx,
} else { } else {
pr_debug("Pairwise Key Assign\n"); pr_debug("Pairwise Key Assign\n");
// BSSID not 0xffffffffffff /* BSSID not 0xffffffffffff */
// Pairwise Key can't be WEP /* Pairwise Key can't be WEP */
if (byKeyDecMode == KEY_CTL_WEP) { if (byKeyDecMode == KEY_CTL_WEP) {
pr_debug("Pairwise Key can't be WEP\n"); pr_debug("Pairwise Key can't be WEP\n");
return -EINVAL; return -EINVAL;
} }
dwKeyIndex |= (1 << 30); // set pairwise key dwKeyIndex |= (1 << 30); /* set pairwise key */
if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA) if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA)
return -EINVAL; return -EINVAL;
@ -381,10 +381,10 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx,
pr_debug("Pairwise Key Set\n"); pr_debug("Pairwise Key Set\n");
} else { } else {
// Key Table Full /* Key Table Full */
return -EINVAL; return -EINVAL;
} }
} // BSSID not 0xffffffffffff } /* BSSID not 0xffffffffffff */
if ((ret == 0) && ((param->u.wpa_key.set_tx) != 0)) { if ((ret == 0) && ((param->u.wpa_key.set_tx) != 0)) {
pDevice->byKeyIndex = (unsigned char)param->u.wpa_key.key_index; pDevice->byKeyIndex = (unsigned char)param->u.wpa_key.key_index;
pDevice->bTransmitKey = true; pDevice->bTransmitKey = true;
@ -665,7 +665,7 @@ static int wpa_set_associate(struct vnt_private *pDevice,
unsigned char abyWPAIE[64]; unsigned char abyWPAIE[64];
bool bWepEnabled = false; bool bWepEnabled = false;
// set key type & algorithm /* set key type & algorithm */
pr_debug("pairwise_suite = %d\n", pr_debug("pairwise_suite = %d\n",
param->u.wpa_associate.pairwise_suite); param->u.wpa_associate.pairwise_suite);
pr_debug("group_suite = %d\n", param->u.wpa_associate.group_suite); pr_debug("group_suite = %d\n", param->u.wpa_associate.group_suite);
@ -688,13 +688,13 @@ static int wpa_set_associate(struct vnt_private *pDevice,
pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA; pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;
else else
pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA; pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
// set ssid /* set ssid */
memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
pItemSSID->byElementID = WLAN_EID_SSID; pItemSSID->byElementID = WLAN_EID_SSID;
pItemSSID->len = param->u.wpa_associate.ssid_len; pItemSSID->len = param->u.wpa_associate.ssid_len;
memcpy(pItemSSID->abySSID, param->u.wpa_associate.ssid, pItemSSID->len); memcpy(pItemSSID->abySSID, param->u.wpa_associate.ssid, pItemSSID->len);
// set bssid /* set bssid */
if (memcmp(param->u.wpa_associate.bssid, &abyNullAddr[0], 6) != 0) if (memcmp(param->u.wpa_associate.bssid, &abyNullAddr[0], 6) != 0)
memcpy(pMgmt->abyDesireBSSID, param->u.wpa_associate.bssid, 6); memcpy(pMgmt->abyDesireBSSID, param->u.wpa_associate.bssid, 6);
else else