Commit 9edaa5f3 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: change if with else if

The if statement should be else if since it is part of whole if condition.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0b9f3e4
...@@ -1764,9 +1764,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1764,9 +1764,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
strWIDList, 4, strWIDList, 4,
get_id_from_handler(hif_drv)); get_id_from_handler(hif_drv));
kfree(pu8keybuf); kfree(pu8keybuf);
} } else if (pstrHostIFkeyAttr->action & ADDKEY) {
if (pstrHostIFkeyAttr->action & ADDKEY) {
PRINT_D(HOSTINF_DBG, "Handling WEP key\n"); PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
pu8keybuf = kmalloc(pstrHostIFkeyAttr->attr.wep.key_len + 2, GFP_KERNEL); pu8keybuf = kmalloc(pstrHostIFkeyAttr->attr.wep.key_len + 2, GFP_KERNEL);
if (!pu8keybuf) { if (!pu8keybuf) {
...@@ -1848,9 +1846,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1848,9 +1846,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
kfree(pu8keybuf); kfree(pu8keybuf);
up(&hif_drv->sem_test_key_block); up(&hif_drv->sem_test_key_block);
} } else if (pstrHostIFkeyAttr->action & ADDKEY) {
if (pstrHostIFkeyAttr->action & ADDKEY) {
PRINT_D(HOSTINF_DBG, "Handling group key(Rx) function\n"); PRINT_D(HOSTINF_DBG, "Handling group key(Rx) function\n");
pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL); pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
...@@ -1921,8 +1917,7 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1921,8 +1917,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
get_id_from_handler(hif_drv)); get_id_from_handler(hif_drv));
kfree(pu8keybuf); kfree(pu8keybuf);
up(&hif_drv->sem_test_key_block); up(&hif_drv->sem_test_key_block);
} } else if (pstrHostIFkeyAttr->action & ADDKEY) {
if (pstrHostIFkeyAttr->action & ADDKEY) {
pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL); pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL);
if (!pu8keybuf) { if (!pu8keybuf) {
PRINT_ER("No buffer to send PTK Key\n"); PRINT_ER("No buffer to send PTK Key\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment