net/ice/base: fix RSS removal for GTP-U

[dpdk.git] / drivers / net / mvneta / mvneta_ethdev.c

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index a8def8f..673a8e2 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -34,8 +34,6 @@
 /** Maximum length of a match string */
 #define MVNETA_MATCH_LEN 16
 
-int mvneta_logtype;
-
 static const char * const valid_args[] = {
        MVNETA_IFACE_NAME_ARG,
        NULL
@@ -48,7 +46,7 @@ struct mvneta_ifnames {
 
 static int mvneta_dev_num;
 
-static void mvneta_stats_reset(struct rte_eth_dev *dev);
+static int mvneta_stats_reset(struct rte_eth_dev *dev);
 static int rte_pmd_mvneta_remove(struct rte_vdev_device *vdev);
 
 
@@ -153,7 +151,7 @@ mvneta_dev_configure(struct rte_eth_dev *dev)
  * @param info
  *   Info structure output buffer.
  */
-static void
+static int
 mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
                   struct rte_eth_dev_info *info)
 {
@@ -187,6 +185,8 @@ mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
        info->default_txconf.offloads = 0;
 
        info->max_rx_pktlen = MVNETA_PKT_SIZE_MAX;
+
+       return 0;
 }
 
 /**
@@ -532,25 +532,30 @@ mvneta_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0
  */
-static void
+static int
 mvneta_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret, en;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        neta_ppio_get_promisc(priv->ppio, &en);
        if (en) {
                MVNETA_LOG(INFO, "Promiscuous already enabled");
-               return;
+               return 0;
        }
 
        ret = neta_ppio_set_promisc(priv->ppio, 1);
        if (ret)
                MVNETA_LOG(ERR, "Failed to enable promiscuous mode");
+
+       return 0;
 }
 
 /**
@@ -558,25 +563,30 @@ mvneta_promiscuous_enable(struct rte_eth_dev *dev)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0
  */
-static void
+static int
 mvneta_promiscuous_disable(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret, en;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        neta_ppio_get_promisc(priv->ppio, &en);
        if (!en) {
                MVNETA_LOG(INFO, "Promiscuous already disabled");
-               return;
+               return 0;
        }
 
        ret = neta_ppio_set_promisc(priv->ppio, 0);
        if (ret)
                MVNETA_LOG(ERR, "Failed to disable promiscuous mode");
+
+       return 0;
 }
 
 /**
@@ -724,19 +734,24 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   0 on success, negative error value otherwise.
  */
-static void
+static int
 mvneta_stats_reset(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        unsigned int ret;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        ret = mvneta_stats_get(dev, &priv->prev_stats);
        if (unlikely(ret))
-               RTE_LOG(ERR, PMD, "Failed to reset port statistics");
+               MVNETA_LOG(ERR, "Failed to reset port statistics");
+
+       return ret;
 }
 
 
@@ -965,10 +980,4 @@ static struct rte_vdev_driver pmd_mvneta_drv = {
 
 RTE_PMD_REGISTER_VDEV(net_mvneta, pmd_mvneta_drv);
 RTE_PMD_REGISTER_PARAM_STRING(net_mvneta, "iface=<ifc>");
-
-RTE_INIT(mvneta_init_log)
-{
-       mvneta_logtype = rte_log_register("pmd.net.mvneta");
-       if (mvneta_logtype >= 0)
-               rte_log_set_level(mvneta_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(mvneta_logtype, pmd.net.mvneta, NOTICE);