Imported Upstream version 17.05

[deb_dpdk.git] / drivers / net / e1000 / igb_pf.c

diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c
index 5845bc2..923c78a 100644 (file)
--- a/drivers/net/e1000/igb_pf.c
+++ b/drivers/net/e1000/igb_pf.c
@@ -57,7 +57,9 @@
 static inline uint16_t
 dev_num_vf(struct rte_eth_dev *eth_dev)
 {
-       return eth_dev->pci_dev->max_vfs;
+       struct rte_pci_device *pci_dev = E1000_DEV_TO_PCI(eth_dev);
+
+       return pci_dev->max_vfs;
 }
 
 static inline
@@ -330,12 +332,16 @@ igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.rar_entry_count - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
+       int rah;
 
        if (is_unicast_ether_addr((struct ether_addr *)new_mac)) {
                if (!is_zero_ether_addr((struct ether_addr *)new_mac))
                        rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac,
                                sizeof(vfinfo[vf].vf_mac_addresses));
                hw->mac.ops.rar_set(hw, new_mac, rar_entry);
+               rah = E1000_READ_REG(hw, E1000_RAH(rar_entry));
+               rah |= (0x1 << (E1000_RAH_POOLSEL_SHIFT + vf));
+               E1000_WRITE_REG(hw, E1000_RAH(rar_entry), rah);
                return 0;
        }
        return -1;