diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
| commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
| tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /drivers/net/ethernet/intel/igbvf/vf.c | |
| parent | ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init (diff) | |
| parent | ARM: OMAP2+: Fix eMMC on n900 with device tree (diff) | |
| download | linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.xz linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip | |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'drivers/net/ethernet/intel/igbvf/vf.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igbvf/vf.c | 4 |
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) ret_val = mbx->ops.read_posted(hw, msgbuf, 3); if (!ret_val) { if (msgbuf[0] == (E1000_VF_RESET | E1000_VT_MSGTYPE_ACK)) - memcpy(hw->mac.perm_addr, addr, 6); + memcpy(hw->mac.perm_addr, addr, ETH_ALEN); else ret_val = -E1000_ERR_MAC_INIT; } @@ -314,7 +314,7 @@ static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index) memset(msgbuf, 0, 12); msgbuf[0] = E1000_VF_SET_MAC_ADDR; - memcpy(msg_addr, addr, 6); + memcpy(msg_addr, addr, ETH_ALEN); ret_val = mbx->ops.write_posted(hw, msgbuf, 3); if (!ret_val) |