e1000: move to drivers/net/

[dpdk.git] / lib / librte_pmd_enic / enic_main.c

diff --git a/lib/librte_pmd_enic/enic_main.c b/lib/librte_pmd_enic/enic_main.c
index 48fdca2..15313c2 100644 (file)
--- a/lib/librte_pmd_enic/enic_main.c
+++ b/lib/librte_pmd_enic/enic_main.c
@@ -344,7 +344,7 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
                hdr_mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 
                hdr_mbuf->nb_segs = 2;
-               hdr_mbuf->port = rq->index;
+               hdr_mbuf->port = enic->port_id;
                hdr_mbuf->next = mbuf;
 
                dma_addr = (dma_addr_t)
@@ -359,7 +359,7 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
                type = RQ_ENET_TYPE_NOT_SOP;
        } else {
                mbuf->nb_segs = 1;
-               mbuf->port = rq->index;
+               mbuf->port = enic->port_id;
        }
 
        mbuf->data_off = RTE_PKTMBUF_HEADROOM;
@@ -840,10 +840,12 @@ static int enic_set_rsskey(struct enic *enic)
        dma_addr_t rss_key_buf_pa;
        union vnic_rss_key *rss_key_buf_va = NULL;
        static union vnic_rss_key rss_key = {
-               .key[0] = {.b = {85, 67, 83, 97, 119, 101, 115, 111, 109, 101}},
-               .key[1] = {.b = {80, 65, 76, 79, 117, 110, 105, 113, 117, 101}},
-               .key[2] = {.b = {76, 73, 78, 85, 88, 114, 111, 99, 107, 115}},
-               .key[3] = {.b = {69, 78, 73, 67, 105, 115, 99, 111, 111, 108}},
+               .key = {
+                       [0] = {.b = {85, 67, 83, 97, 119, 101, 115, 111, 109, 101}},
+                       [1] = {.b = {80, 65, 76, 79, 117, 110, 105, 113, 117, 101}},
+                       [2] = {.b = {76, 73, 78, 85, 88, 114, 111, 99, 107, 115}},
+                       [3] = {.b = {69, 78, 73, 67, 105, 115, 99, 111, 111, 108}},
+               }
        };
        int err;
        u8 name[NAME_MAX];
@@ -981,8 +983,7 @@ static void enic_dev_deinit(struct enic *enic)
 {
        struct rte_eth_dev *eth_dev = enic->rte_dev;
 
-       if (eth_dev->data->mac_addrs)
-               rte_free(eth_dev->data->mac_addrs);
+       rte_free(eth_dev->data->mac_addrs);
 }
 
 
@@ -1046,7 +1047,7 @@ int enic_probe(struct enic *enic)
        struct rte_pci_device *pdev = enic->pdev;
        int err = -1;
 
-       dev_info(enic, " Initializing ENIC PMD version %s\n", DRV_VERSION);
+       dev_debug(enic, " Initializing ENIC PMD version %s\n", DRV_VERSION);
 
        enic->bar0.vaddr = (void *)pdev->mem_resource[0].addr;
        enic->bar0.len = pdev->mem_resource[0].len;