ethdev: change promiscuous callbacks to return status

[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 846d7fd..bfe978c 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -44,7 +44,6 @@
 
 #define VMXNET3_TX_OFFLOAD_CAP         \
        (DEV_TX_OFFLOAD_VLAN_INSERT |   \
-        DEV_TX_OFFLOAD_IPV4_CKSUM |    \
         DEV_TX_OFFLOAD_TCP_CKSUM |     \
         DEV_TX_OFFLOAD_UDP_CKSUM |     \
         DEV_TX_OFFLOAD_TCP_TSO |       \
@@ -52,8 +51,8 @@
 
 #define VMXNET3_RX_OFFLOAD_CAP         \
        (DEV_RX_OFFLOAD_VLAN_STRIP |    \
+        DEV_RX_OFFLOAD_VLAN_FILTER |   \
         DEV_RX_OFFLOAD_SCATTER |       \
-        DEV_RX_OFFLOAD_IPV4_CKSUM |    \
         DEV_RX_OFFLOAD_UDP_CKSUM |     \
         DEV_RX_OFFLOAD_TCP_CKSUM |     \
         DEV_RX_OFFLOAD_TCP_LRO |       \
@@ -66,8 +65,8 @@ static int vmxnet3_dev_start(struct rte_eth_dev *dev);
 static void vmxnet3_dev_stop(struct rte_eth_dev *dev);
 static void vmxnet3_dev_close(struct rte_eth_dev *dev);
 static void vmxnet3_dev_set_rxmode(struct vmxnet3_hw *hw, uint32_t feature, int set);
-static void vmxnet3_dev_promiscuous_enable(struct rte_eth_dev *dev);
-static void vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static int vmxnet3_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static int vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev);
 static void vmxnet3_dev_allmulticast_enable(struct rte_eth_dev *dev);
 static void vmxnet3_dev_allmulticast_disable(struct rte_eth_dev *dev);
 static int __vmxnet3_dev_link_update(struct rte_eth_dev *dev,
@@ -83,15 +82,15 @@ static int vmxnet3_dev_xstats_get_names(struct rte_eth_dev *dev,
                                        unsigned int n);
 static int vmxnet3_dev_xstats_get(struct rte_eth_dev *dev,
                                  struct rte_eth_xstat *xstats, unsigned int n);
-static void vmxnet3_dev_info_get(struct rte_eth_dev *dev,
-                                struct rte_eth_dev_info *dev_info);
+static int vmxnet3_dev_info_get(struct rte_eth_dev *dev,
+                               struct rte_eth_dev_info *dev_info);
 static const uint32_t *
 vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev);
 static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
                                       uint16_t vid, int on);
 static int vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
 static int vmxnet3_mac_addr_set(struct rte_eth_dev *dev,
-                                struct ether_addr *mac_addr);
+                                struct rte_ether_addr *mac_addr);
 static void vmxnet3_interrupt_handler(void *param);
 
 int vmxnet3_logtype_init;
@@ -306,16 +305,16 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
        memcpy(hw->perm_addr + 4, &mac_hi, 2);
 
        /* Allocate memory for storing MAC addresses */
-       eth_dev->data->mac_addrs = rte_zmalloc("vmxnet3", ETHER_ADDR_LEN *
+       eth_dev->data->mac_addrs = rte_zmalloc("vmxnet3", RTE_ETHER_ADDR_LEN *
                                               VMXNET3_MAX_MAC_ADDRS, 0);
        if (eth_dev->data->mac_addrs == NULL) {
                PMD_INIT_LOG(ERR,
                             "Failed to allocate %d bytes needed to store MAC addresses",
-                            ETHER_ADDR_LEN * VMXNET3_MAX_MAC_ADDRS);
+                            RTE_ETHER_ADDR_LEN * VMXNET3_MAX_MAC_ADDRS);
                return -ENOMEM;
        }
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct ether_addr *) hw->perm_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->perm_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        PMD_INIT_LOG(DEBUG, "MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
@@ -1131,8 +1130,8 @@ vmxnet3_dev_stats_reset(struct rte_eth_dev *dev)
 {
        unsigned int i;
        struct vmxnet3_hw *hw = dev->data->dev_private;
-       struct UPT1_TxStats txStats;
-       struct UPT1_RxStats rxStats;
+       struct UPT1_TxStats txStats = {0};
+       struct UPT1_RxStats rxStats = {0};
 
        VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
 
@@ -1150,8 +1149,8 @@ vmxnet3_dev_stats_reset(struct rte_eth_dev *dev)
        }
 }
 
-static void
-vmxnet3_dev_info_get(struct rte_eth_dev *dev __rte_unused,
+static int
+vmxnet3_dev_info_get(struct rte_eth_dev *dev,
                     struct rte_eth_dev_info *dev_info)
 {
        struct vmxnet3_hw *hw = dev->data->dev_private;
@@ -1187,6 +1186,8 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev __rte_unused,
        dev_info->rx_queue_offload_capa = 0;
        dev_info->tx_offload_capa = VMXNET3_TX_OFFLOAD_CAP;
        dev_info->tx_queue_offload_capa = 0;
+
+       return 0;
 }
 
 static const uint32_t *
@@ -1204,11 +1205,11 @@ vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 }
 
 static int
-vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        struct vmxnet3_hw *hw = dev->data->dev_private;
 
-       ether_addr_copy(mac_addr, (struct ether_addr *)(hw->perm_addr));
+       rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));
        vmxnet3_write_mac(hw, mac_addr->addr_bytes);
        return 0;
 }
@@ -1261,7 +1262,7 @@ vmxnet3_dev_set_rxmode(struct vmxnet3_hw *hw, uint32_t feature, int set)
 }
 
 /* Promiscuous supported only if Vmxnet3_DriverShared is initialized in adapter */
-static void
+static int
 vmxnet3_dev_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct vmxnet3_hw *hw = dev->data->dev_private;
@@ -1272,10 +1273,12 @@ vmxnet3_dev_promiscuous_enable(struct rte_eth_dev *dev)
 
        VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+
+       return 0;
 }
 
 /* Promiscuous supported only if Vmxnet3_DriverShared is initialized in adapter */
-static void
+static int
 vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
        struct vmxnet3_hw *hw = dev->data->dev_private;
@@ -1289,6 +1292,8 @@ vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev)
        vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_PROMISC, 0);
        VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
                               VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+
+       return 0;
 }
 
 /* Allmulticast supported only if Vmxnet3_DriverShared is initialized in adapter */
@@ -1425,7 +1430,7 @@ vmxnet3_interrupt_handler(void *param)
 
        vmxnet3_process_events(dev);
 
-       if (rte_intr_enable(&pci_dev->intr_handle) < 0)
+       if (rte_intr_ack(&pci_dev->intr_handle) < 0)
                PMD_DRV_LOG(ERR, "interrupt enable failed");
 }