diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-12-08 17:17:23 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-12-08 17:17:27 +0000 |
| commit | 1754d8e45ba3f8b13484dee3c2b8ac4d845f2b74 (patch) | |
| tree | db372b59e29883bab5802c65b462c38a01b7b33a /drivers/net/vmxnet3/vmxnet3_ethdev.c | |
| parent | fc42933813b2ba541bed9ef6b3e616dbf4b762ec (diff) | |
| parent | 47d9763a1dd3103d732da9eec350cfc1cd784717 (diff) | |
Merge branch 'upstream-16.11-stable' into 16.11.x
Change-Id: Ida57d6d5aedcd4fe3a504a9ced733e73deee76c5
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_ethdev.c')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index aedac6ca..2bd2f272 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -441,10 +441,10 @@ vmxnet3_write_mac(struct vmxnet3_hw *hw, const uint8_t *addr) addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); - val = *(const uint32_t *)addr; + memcpy(&val, addr, 4); VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_MACL, val); - val = (addr[5] << 8) | addr[4]; + memcpy(&val, addr + 4, 2); VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_MACH, val); } @@ -762,6 +762,8 @@ vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr) { struct vmxnet3_hw *hw = dev->data->dev_private; + ether_addr_copy(mac_addr, (struct ether_addr *)(hw->perm_addr)); + ether_addr_copy(mac_addr, &dev->data->mac_addrs[0]); vmxnet3_write_mac(hw, mac_addr->addr_bytes); } |