aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igbvf
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-10-01 22:04:40 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-02 17:04:45 -0400
commitd458cdf712e0c671e8e819abb16ecd6e44f9daec (patch)
treeff93ce90fee219f2690a4f51f985815422664b7a /drivers/net/ethernet/intel/igbvf
parent0b3d8e087bbee2a4e3f479d538a7edd3f1d2950c (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/intel/igbvf')
-rw-r--r--drivers/net/ethernet/intel/igbvf/vf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
index eea0e10ce12f..955ad8c2c534 100644
--- a/drivers/net/ethernet/intel/igbvf/vf.c
+++ b/drivers/net/ethernet/intel/igbvf/vf.c
@@ -154,7 +154,7 @@ static s32 e1000_reset_hw_vf(struct e1000_hw *hw)
154 ret_val = mbx->ops.read_posted(hw, msgbuf, 3); 154 ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
155 if (!ret_val) { 155 if (!ret_val) {
156 if (msgbuf[0] == (E1000_VF_RESET | E1000_VT_MSGTYPE_ACK)) 156 if (msgbuf[0] == (E1000_VF_RESET | E1000_VT_MSGTYPE_ACK))
157 memcpy(hw->mac.perm_addr, addr, 6); 157 memcpy(hw->mac.perm_addr, addr, ETH_ALEN);
158 else 158 else
159 ret_val = -E1000_ERR_MAC_INIT; 159 ret_val = -E1000_ERR_MAC_INIT;
160 } 160 }
@@ -314,7 +314,7 @@ static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index)
314 314
315 memset(msgbuf, 0, 12); 315 memset(msgbuf, 0, 12);
316 msgbuf[0] = E1000_VF_SET_MAC_ADDR; 316 msgbuf[0] = E1000_VF_SET_MAC_ADDR;
317 memcpy(msg_addr, addr, 6); 317 memcpy(msg_addr, addr, ETH_ALEN);
318 ret_val = mbx->ops.write_posted(hw, msgbuf, 3); 318 ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
319 319
320 if (!ret_val) 320 if (!ret_val)