net:drivers/net: Miscellaneous conversions to ETH_ALEN
Convert the memset/memcpy uses of 6 to ETH_ALEN where appropriate. Also convert some struct definitions and u8 array declarations of [6] to ETH_ALEN. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
0b3d8e087b
commit
d458cdf712
@@ -183,7 +183,7 @@ prism54_update_stats(struct work_struct *work)
|
||||
data = r.ptr;
|
||||
|
||||
/* copy this MAC to the bss */
|
||||
memcpy(bss.address, data, 6);
|
||||
memcpy(bss.address, data, ETH_ALEN);
|
||||
kfree(data);
|
||||
|
||||
/* now ask for the corresponding bss */
|
||||
@@ -531,7 +531,7 @@ prism54_set_wap(struct net_device *ndev, struct iw_request_info *info,
|
||||
return -EINVAL;
|
||||
|
||||
/* prepare the structure for the set object */
|
||||
memcpy(&bssid[0], awrq->sa_data, 6);
|
||||
memcpy(&bssid[0], awrq->sa_data, ETH_ALEN);
|
||||
|
||||
/* set the bssid -- does this make sense when in AP mode? */
|
||||
rvalue = mgt_set_request(priv, DOT11_OID_BSSID, 0, &bssid);
|
||||
@@ -550,7 +550,7 @@ prism54_get_wap(struct net_device *ndev, struct iw_request_info *info,
|
||||
int rvalue;
|
||||
|
||||
rvalue = mgt_get_request(priv, DOT11_OID_BSSID, 0, NULL, &r);
|
||||
memcpy(awrq->sa_data, r.ptr, 6);
|
||||
memcpy(awrq->sa_data, r.ptr, ETH_ALEN);
|
||||
awrq->sa_family = ARPHRD_ETHER;
|
||||
kfree(r.ptr);
|
||||
|
||||
@@ -582,7 +582,7 @@ prism54_translate_bss(struct net_device *ndev, struct iw_request_info *info,
|
||||
size_t wpa_ie_len;
|
||||
|
||||
/* The first entry must be the MAC address */
|
||||
memcpy(iwe.u.ap_addr.sa_data, bss->address, 6);
|
||||
memcpy(iwe.u.ap_addr.sa_data, bss->address, ETH_ALEN);
|
||||
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
|
||||
iwe.cmd = SIOCGIWAP;
|
||||
current_ev = iwe_stream_add_event(info, current_ev, end_buf,
|
||||
@@ -2489,7 +2489,7 @@ prism54_set_mac_address(struct net_device *ndev, void *addr)
|
||||
&((struct sockaddr *) addr)->sa_data);
|
||||
if (!ret)
|
||||
memcpy(priv->ndev->dev_addr,
|
||||
&((struct sockaddr *) addr)->sa_data, 6);
|
||||
&((struct sockaddr *) addr)->sa_data, ETH_ALEN);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user