diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2012-11-24 14:56:09 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 16:24:16 -0800 |
| commit | c9f3bc59c075f7fe565f38d4ff91faea7661bad9 (patch) | |
| tree | d12e889bceab48696ce8a5ebdbdcef8740bca556 /drivers/staging/vt6656/wpactl.c | |
| parent | 0fdb56dabddd3706ab343aa1278019bd5c8aef21 (diff) | |
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/vt6656/wpactl.c')
| -rw-r--r-- | drivers/staging/vt6656/wpactl.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index 4fe2e60665d0..cc1d48bced2d 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++) { |