diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-16 18:31:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-16 18:31:56 -0500 |
| commit | f85fa279138489543206381883c8f67ef94aa912 (patch) | |
| tree | d54d632556885732e94cf18c7cf8d3bef2c740b5 /drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | |
| parent | 358b838291f618278080bbed435b755f9b46748e (diff) | |
| parent | ea99d832cce7e724ba37c488e0571a00cb14d430 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 00fcd39ad66..cf6812dd143 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -572,7 +572,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) /* reply to reset with ack and vf mac address */ msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK; - memcpy(new_mac, vf_mac, IXGBE_ETH_LENGTH_OF_ADDRESS); + memcpy(new_mac, vf_mac, ETH_ALEN); /* * Piggyback the multicast filter type so VF can compute the * correct vectors |