diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2012-11-24 14:56:09 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-27 00:24:16 (GMT) |
commit | c9f3bc59c075f7fe565f38d4ff91faea7661bad9 (patch) | |
tree | d12e889bceab48696ce8a5ebdbdcef8740bca556 /drivers/staging | |
parent | 0fdb56dabddd3706ab343aa1278019bd5c8aef21 (diff) | |
download | linux-fsl-qoriq-c9f3bc59c075f7fe565f38d4ff91faea7661bad9.tar.xz |
staging: vt6656: wpa_set_keys remove fcpfkernel
Only TRUE is ever called, remove FALSE code.
Since copy_from_user has been removed, the unlock..lock spin locks have been removed.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6656/iwctl.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/wpactl.c | 28 | ||||
-rw-r--r-- | drivers/staging/vt6656/wpactl.h | 2 |
3 files changed, 5 insertions, 27 deletions
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index 2cd8b0a..52fce69 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -1724,7 +1724,7 @@ int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info, } /*******/ spin_lock_irq(&pDevice->lock); - ret = wpa_set_keys(pDevice, param, TRUE); + ret = wpa_set_keys(pDevice, param); spin_unlock_irq(&pDevice->lock); error: diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index 4fe2e60..cc1d48b 100644 --- a/drivers/staging/vt6656/wpactl.c +++ b/drivers/staging/vt6656/wpactl.c @@ -67,7 +67,7 @@ static int msglevel = MSG_LEVEL_INFO; * Return Value: * */ - int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel) +int wpa_set_keys(PSDevice pDevice, void *ctx) { struct viawget_wpa_param *param = ctx; PSMgmtObject pMgmt = &pDevice->sMgmtObj; @@ -99,18 +99,7 @@ static int msglevel = MSG_LEVEL_INFO; if (param->u.wpa_key.key && param->u.wpa_key.key_len > sizeof(abyKey)) return -EINVAL; - spin_unlock_irq(&pDevice->lock); - if (param->u.wpa_key.key && fcpfkernel) { - memcpy(&abyKey[0], param->u.wpa_key.key, param->u.wpa_key.key_len); - } else { - if (param->u.wpa_key.key && - copy_from_user(&abyKey[0], param->u.wpa_key.key, - param->u.wpa_key.key_len)) { - spin_lock_irq(&pDevice->lock); - return -EINVAL; - } - } - spin_lock_irq(&pDevice->lock); + memcpy(&abyKey[0], param->u.wpa_key.key, param->u.wpa_key.key_len); dwKeyIndex = (DWORD)(param->u.wpa_key.key_index); @@ -142,18 +131,7 @@ static int msglevel = MSG_LEVEL_INFO; if (param->u.wpa_key.seq && param->u.wpa_key.seq_len > sizeof(abySeq)) return -EINVAL; - spin_unlock_irq(&pDevice->lock); - if (param->u.wpa_key.seq && fcpfkernel) { - memcpy(&abySeq[0], param->u.wpa_key.seq, param->u.wpa_key.seq_len); - } else { - if (param->u.wpa_key.seq && - copy_from_user(&abySeq[0], param->u.wpa_key.seq, - param->u.wpa_key.seq_len)) { - spin_lock_irq(&pDevice->lock); - return -EINVAL; - } - } - spin_lock_irq(&pDevice->lock); + memcpy(&abySeq[0], param->u.wpa_key.seq, param->u.wpa_key.seq_len); if (param->u.wpa_key.seq_len > 0) { for (ii = 0 ; ii < param->u.wpa_key.seq_len ; ii++) { diff --git a/drivers/staging/vt6656/wpactl.h b/drivers/staging/vt6656/wpactl.h index 14dcf0b..b4ec6b0 100644 --- a/drivers/staging/vt6656/wpactl.h +++ b/drivers/staging/vt6656/wpactl.h @@ -52,6 +52,6 @@ typedef unsigned long long NDIS_802_11_KEY_RSC; /*--------------------- Export Functions --------------------------*/ -int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel); +int wpa_set_keys(PSDevice pDevice, void *ctx); #endif /* __WPACL_H__ */ |