Skip to content

Commit b121d84

Browse files
tchardinggregkh
authored andcommitted
staging: ks7010: simplify calls to memcpy()
Function uses overly complex calls to memcpy(). Code may be simplified by the use of a local variable. Code sometimes uses explicit address of initial array element and sometimes does not. Uniformity aids readability. If array pointers are explicit it aids readability further. Simplify calls to memcpy(). Add local pointer variable, define it to the correct memory location. Use newly defined variable in calls to memcpy(). Be uniform in use of explicit address of first element of array (&foo[0]). Signed-off-by: Tobin C. Harding <me@tobin.cc> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9ff19a6 commit b121d84

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

drivers/staging/ks7010/ks_wlan_net.c

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,6 +1769,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
17691769
struct iw_encode_ext *enc;
17701770
int index = dwrq->flags & IW_ENCODE_INDEX;
17711771
unsigned int commit = 0;
1772+
struct wpa_key_t *key;
17721773

17731774
enc = (struct iw_encode_ext *)extra;
17741775
if (!enc)
@@ -1784,6 +1785,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
17841785
if (index < 1 || index > 4)
17851786
return -EINVAL;
17861787
index--;
1788+
key = &priv->wpa.key[index];
17871789

17881790
if (dwrq->flags & IW_ENCODE_DISABLED)
17891791
priv->wpa.key[index].key_len = 0;
@@ -1793,12 +1795,10 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
17931795
priv->wpa.txkey = index;
17941796
commit |= SME_WEP_INDEX;
17951797
} else if (enc->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
1796-
memcpy(&priv->wpa.key[index].rx_seq[0],
1797-
enc->rx_seq, IW_ENCODE_SEQ_MAX_SIZE);
1798+
memcpy(&key->rx_seq[0], &enc->rx_seq[0], IW_ENCODE_SEQ_MAX_SIZE);
17981799
}
17991800

1800-
memcpy(&priv->wpa.key[index].addr.sa_data[0],
1801-
&enc->addr.sa_data[0], ETH_ALEN);
1801+
memcpy(&key->addr.sa_data[0], &enc->addr.sa_data[0], ETH_ALEN);
18021802

18031803
switch (enc->alg) {
18041804
case IW_ENCODE_ALG_NONE:
@@ -1816,9 +1816,8 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
18161816
commit |= SME_WEP_FLAG;
18171817
}
18181818
if (enc->key_len) {
1819-
memcpy(&priv->wpa.key[index].key_val[0],
1820-
&enc->key[0], enc->key_len);
1821-
priv->wpa.key[index].key_len = enc->key_len;
1819+
memcpy(&key->key_val[0], &enc->key[0], enc->key_len);
1820+
key->key_len = enc->key_len;
18221821
commit |= (SME_WEP_VAL1 << index);
18231822
}
18241823
break;
@@ -1828,20 +1827,14 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
18281827
commit |= SME_WEP_FLAG;
18291828
}
18301829
if (enc->key_len == 32) {
1831-
memcpy(&priv->wpa.key[index].key_val[0],
1832-
&enc->key[0], enc->key_len - 16);
1833-
priv->wpa.key[index].key_len =
1834-
enc->key_len - 16;
1830+
memcpy(&key->key_val[0], &enc->key[0], enc->key_len - 16);
1831+
key->key_len = enc->key_len - 16;
18351832
if (priv->wpa.key_mgmt_suite == 4) { /* WPA_NONE */
1836-
memcpy(&priv->wpa.key[index].
1837-
tx_mic_key[0], &enc->key[16], 8);
1838-
memcpy(&priv->wpa.key[index].
1839-
rx_mic_key[0], &enc->key[16], 8);
1833+
memcpy(&key->tx_mic_key[0], &enc->key[16], 8);
1834+
memcpy(&key->rx_mic_key[0], &enc->key[16], 8);
18401835
} else {
1841-
memcpy(&priv->wpa.key[index].
1842-
tx_mic_key[0], &enc->key[16], 8);
1843-
memcpy(&priv->wpa.key[index].
1844-
rx_mic_key[0], &enc->key[24], 8);
1836+
memcpy(&key->tx_mic_key[0], &enc->key[16], 8);
1837+
memcpy(&key->rx_mic_key[0], &enc->key[24], 8);
18451838
}
18461839
commit |= (SME_WEP_VAL1 << index);
18471840
}

0 commit comments

Comments
 (0)