net/netvsc: change datapath logging

[dpdk.git] / drivers / net / netvsc / hn_ethdev.c

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 7bf5465..0f4827c 100644 (file)
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -58,6 +58,7 @@ static const struct hn_xstats_name_off hn_stat_strings[] = {
        { "good_bytes",             offsetof(struct hn_stats, bytes) },
        { "errors",                 offsetof(struct hn_stats, errors) },
        { "ring full",              offsetof(struct hn_stats, ring_full) },
+       { "channel full",           offsetof(struct hn_stats, channel_full) },
        { "multicast_packets",      offsetof(struct hn_stats, multicast) },
        { "broadcast_packets",      offsetof(struct hn_stats, broadcast) },
        { "undersize_packets",      offsetof(struct hn_stats, size_bins[0]) },
@@ -376,14 +377,15 @@ static int hn_rss_hash_update(struct rte_eth_dev *dev,
 
        hn_rss_hash_init(hv, rss_conf);
 
-       err = hn_rndis_conf_rss(hv, 0);
-       if (err) {
-               PMD_DRV_LOG(NOTICE,
-                           "rss reconfig failed (RSS disabled)");
-               return err;
+       if (rss_conf->rss_hf != 0) {
+               err = hn_rndis_conf_rss(hv, 0);
+               if (err) {
+                       PMD_DRV_LOG(NOTICE,
+                                   "rss reconfig failed (RSS disabled)");
+                       return err;
+               }
        }
 
-
        return hn_vf_rss_hash_update(dev, rss_conf);
 }
 
@@ -575,7 +577,7 @@ static int hn_dev_configure(struct rte_eth_dev *dev)
                                 dev->data->nb_tx_queues);
 
        for (i = 0; i < NDIS_HASH_INDCNT; i++)
-               hv->rss_ind[i] = i % hv->num_queues;
+               hv->rss_ind[i] = i % dev->data->nb_rx_queues;
 
        hn_rss_hash_init(hv, rss_conf);
 
@@ -595,11 +597,13 @@ static int hn_dev_configure(struct rte_eth_dev *dev)
                        return err;
                }
 
-               err = hn_rndis_conf_rss(hv, 0);
-               if (err) {
-                       PMD_DRV_LOG(NOTICE,
-                                   "initial RSS config failed");
-                       return err;
+               if (rss_conf->rss_hf != 0) {
+                       err = hn_rndis_conf_rss(hv, 0);
+                       if (err) {
+                               PMD_DRV_LOG(NOTICE,
+                                           "initial RSS config failed");
+                               return err;
+                       }
                }
        }
 
@@ -857,6 +861,8 @@ static const struct eth_dev_ops hn_eth_dev_ops = {
        .dev_stop               = hn_dev_stop,
        .dev_close              = hn_dev_close,
        .dev_infos_get          = hn_dev_info_get,
+       .txq_info_get           = hn_dev_tx_queue_info,
+       .rxq_info_get           = hn_dev_rx_queue_info,
        .dev_supported_ptypes_get = hn_vf_supported_ptypes,
        .promiscuous_enable     = hn_dev_promiscuous_enable,
        .promiscuous_disable    = hn_dev_promiscuous_disable,
@@ -870,8 +876,11 @@ static const struct eth_dev_ops hn_eth_dev_ops = {
        .tx_queue_setup         = hn_dev_tx_queue_setup,
        .tx_queue_release       = hn_dev_tx_queue_release,
        .tx_done_cleanup        = hn_dev_tx_done_cleanup,
+       .tx_descriptor_status   = hn_dev_tx_descriptor_status,
        .rx_queue_setup         = hn_dev_rx_queue_setup,
        .rx_queue_release       = hn_dev_rx_queue_release,
+       .rx_queue_count         = hn_dev_rx_queue_count,
+       .rx_descriptor_status   = hn_dev_rx_queue_status,
        .link_update            = hn_dev_link_update,
        .stats_get              = hn_dev_stats_get,
        .stats_reset            = hn_dev_stats_reset,