net/sfc/base: update autogenerated headers from firmwaresrc

[dpdk.git] / drivers / net / vmxnet3 / vmxnet3_ethdev.c

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 4bc0a26..4e68aae 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -27,7 +27,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_ethdev_pci.h>
 #include <rte_string_fns.h>
 #include <rte_malloc.h>
@@ -1123,7 +1123,6 @@ 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);
 }
 
@@ -1306,7 +1305,7 @@ vmxnet3_process_events(struct rte_eth_dev *dev)
                if (vmxnet3_dev_link_update(dev, 0) == 0)
                        _rte_eth_dev_callback_process(dev,
                                                      RTE_ETH_EVENT_INTR_LSC,
-                                                     NULL, NULL);
+                                                     NULL);
        }
 
        /* Check if there is an error on xmit/recv queues */
@@ -1353,10 +1352,10 @@ RTE_INIT(vmxnet3_init_log);
 static void
 vmxnet3_init_log(void)
 {
-       vmxnet3_logtype_init = rte_log_register("pmd.vmxnet3.init");
+       vmxnet3_logtype_init = rte_log_register("pmd.net.vmxnet3.init");
        if (vmxnet3_logtype_init >= 0)
                rte_log_set_level(vmxnet3_logtype_init, RTE_LOG_NOTICE);
-       vmxnet3_logtype_driver = rte_log_register("pmd.vmxnet3.driver");
+       vmxnet3_logtype_driver = rte_log_register("pmd.net.vmxnet3.driver");
        if (vmxnet3_logtype_driver >= 0)
                rte_log_set_level(vmxnet3_logtype_driver, RTE_LOG_NOTICE);
 }