net: add rte prefix to ether structures

[dpdk.git] / drivers / net / ixgbe / ixgbe_vf_representor.c

diff --git a/drivers/net/ixgbe/ixgbe_vf_representor.c b/drivers/net/ixgbe/ixgbe_vf_representor.c
index b0fbbc4..2c01f6e 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_vf_representor.c
+++ b/drivers/net/ixgbe/ixgbe_vf_representor.c
@@ -25,7 +25,7 @@ ixgbe_vf_representor_link_update(struct rte_eth_dev *ethdev,
 
 static int
 ixgbe_vf_representor_mac_addr_set(struct rte_eth_dev *ethdev,
-       struct ether_addr *mac_addr)
+       struct rte_ether_addr *mac_addr)
 {
        struct ixgbe_vf_representor *representor = ethdev->data->dev_private;
 
@@ -135,7 +135,7 @@ ixgbe_vf_representor_vlan_strip_queue_set(struct rte_eth_dev *ethdev,
                representor->vf_id, on);
 }
 
-struct eth_dev_ops ixgbe_vf_representor_dev_ops = {
+static const struct eth_dev_ops ixgbe_vf_representor_dev_ops = {
        .dev_infos_get          = ixgbe_vf_representor_dev_infos_get,
 
        .dev_start              = ixgbe_vf_representor_dev_start,
@@ -192,6 +192,7 @@ ixgbe_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params)
                return -ENODEV;
 
        ethdev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
+       ethdev->data->representor_id = representor->vf_id;
 
        /* Set representor device ops */
        ethdev->dev_ops = &ixgbe_vf_representor_dev_ops;
@@ -210,7 +211,7 @@ ixgbe_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params)
        vf_data = *IXGBE_DEV_PRIVATE_TO_P_VFDATA(
                representor->pf_ethdev->data->dev_private);
 
-       ethdev->data->mac_addrs = (struct ether_addr *)
+       ethdev->data->mac_addrs = (struct rte_ether_addr *)
                vf_data[representor->vf_id].vf_mac_addresses;
 
        /* Link state. Inherited from PF */
@@ -225,7 +226,10 @@ ixgbe_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params)
 }
 
 int
-ixgbe_vf_representor_uninit(struct rte_eth_dev *ethdev __rte_unused)
+ixgbe_vf_representor_uninit(struct rte_eth_dev *ethdev)
 {
+       /* mac_addrs must not be freed because part of ixgbe_vf_info */
+       ethdev->data->mac_addrs = NULL;
+
        return 0;
 }