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>

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 2cd8b0a6b3a1d32a6eff6944669d2b5376a03b34..52fce690250857eacf0a8a39e667310a77d01f18 100644 (file)
--- 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 4fe2e60665d09fe20caf1647e8f4f2a36687a305..cc1d48bced2d9ee4944009c382af8f713f97c76b 100644 (file)
--- 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 14dcf0bac9159c8d3a37ae1842ff9674d105ab66..b4ec6b0e1c670967b2294d9b6ea328da88e370a3 100644 (file)
--- 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__ */