X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fixgbe%2Frte_pmd_ixgbe.c;h=9514f2cf588d3d9ba33df1eca2ed58b76f719c46;hb=7e124ff12c85a438010e49f0cee7eb10593b0ed6;hp=3defba1753cc53b6b420a7a5fe9b96b223e76e54;hpb=6d13ea8e8e49ab957deae2bba5ecf4a4bfe747d1;p=dpdk.git diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c index 3defba1753..9514f2cf58 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c @@ -35,9 +35,10 @@ rte_pmd_ixgbe_set_vf_mac_addr(uint16_t port, uint16_t vf, vfinfo = *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private)); rar_entry = hw->mac.num_rar_entries - (vf + 1); - if (is_valid_assigned_ether_addr((struct rte_ether_addr *)new_mac)) { + if (rte_is_valid_assigned_ether_addr( + (struct rte_ether_addr *)new_mac)) { rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac, - ETHER_ADDR_LEN); + RTE_ETHER_ADDR_LEN); return hw->mac.ops.set_rar(hw, rar_entry, new_mac, vf, IXGBE_RAH_AV); } @@ -154,7 +155,7 @@ rte_pmd_ixgbe_set_vf_vlan_insert(uint16_t port, uint16_t vf, uint16_t vlan_id) if (vf >= pci_dev->max_vfs) return -EINVAL; - if (vlan_id > ETHER_MAX_VLAN_ID) + if (vlan_id > RTE_ETHER_MAX_VLAN_ID) return -EINVAL; hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -476,7 +477,7 @@ rte_pmd_ixgbe_set_vf_vlan_filter(uint16_t port, uint16_t vlan, if (!is_ixgbe_supported(dev)) return -ENOTSUP; - if ((vlan > ETHER_MAX_VLAN_ID) || (vf_mask == 0)) + if (vlan > RTE_ETHER_MAX_VLAN_ID || vf_mask == 0) return -EINVAL; hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -881,7 +882,7 @@ rte_pmd_ixgbe_set_tc_bw_alloc(uint16_t port, return 0; } -int __rte_experimental +int rte_pmd_ixgbe_upd_fctrl_sbp(uint16_t port, int enable) { struct ixgbe_hw *hw; @@ -1095,7 +1096,7 @@ STATIC void rte_pmd_ixgbe_release_swfw(struct ixgbe_hw *hw, u32 mask) ixgbe_release_swfw_semaphore(hw, mask); } -int __rte_experimental +int rte_pmd_ixgbe_mdio_lock(uint16_t port) { struct ixgbe_hw *hw; @@ -1122,7 +1123,7 @@ rte_pmd_ixgbe_mdio_lock(uint16_t port) return IXGBE_SUCCESS; } -int __rte_experimental +int rte_pmd_ixgbe_mdio_unlock(uint16_t port) { struct rte_eth_dev *dev; @@ -1149,7 +1150,7 @@ rte_pmd_ixgbe_mdio_unlock(uint16_t port) return IXGBE_SUCCESS; } -int __rte_experimental +int rte_pmd_ixgbe_mdio_unlocked_read(uint16_t port, uint32_t reg_addr, uint32_t dev_type, uint16_t *phy_data) { @@ -1196,7 +1197,7 @@ rte_pmd_ixgbe_mdio_unlocked_read(uint16_t port, uint32_t reg_addr, return 0; } -int __rte_experimental +int rte_pmd_ixgbe_mdio_unlocked_write(uint16_t port, uint32_t reg_addr, uint32_t dev_type, uint16_t phy_data) {