[PATCH 14/25] staging: ks7010: utilize local variable

Tobin C. Harding me at tobin.cc
Fri Mar 31 01:18:22 UTC 2017


Function contains a local pointer variable defined to a memory location
within a structure. This memory location is later used by
dereferencing the struct instead of using the local pointer. The code
is cleaner if all references of the same memory location use the
local variable.

Utilize existing local pointer variable instead of dereferencing
struct.

Signed-off-by: Tobin C. Harding <me at tobin.cc>
---
 drivers/staging/ks7010/ks_wlan_net.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 80d356b..a71c099 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -1788,9 +1788,9 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
 	key = &priv->wpa.key[index];
 
 	if (dwrq->flags & IW_ENCODE_DISABLED)
-		priv->wpa.key[index].key_len = 0;
+		key->key_len = 0;
 
-	priv->wpa.key[index].ext_flags = enc->ext_flags;
+	key->ext_flags = enc->ext_flags;
 	if (enc->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
 		priv->wpa.txkey = index;
 		commit |= SME_WEP_INDEX;
@@ -1806,7 +1806,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
 			priv->reg.privacy_invoked = 0x00;
 			commit |= SME_WEP_FLAG;
 		}
-		priv->wpa.key[index].key_len = 0;
+		key->key_len = 0;
 
 		break;
 	case IW_ENCODE_ALG_WEP:
@@ -1817,7 +1817,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
 		}
 		if (enc->key_len) {
 			memcpy(key->key_val, enc->key, enc->key_len);
-			priv->wpa.key[index].key_len = enc->key_len;
+			key->key_len = enc->key_len;
 			commit |= (SME_WEP_VAL1 << index);
 		}
 		break;
@@ -1842,7 +1842,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
 	default:
 		return -EINVAL;
 	}
-	priv->wpa.key[index].alg = enc->alg;
+	key->alg = enc->alg;
 
 	if (commit) {
 		if (commit & SME_WEP_INDEX)
-- 
2.7.4



More information about the devel mailing list