net/ice: fix build when Rx descriptor size is 16

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

diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c
index d186dde..62ba396 100644 (file)
--- a/drivers/net/netvsc/hn_rndis.c
+++ b/drivers/net/netvsc/hn_rndis.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
@@ -67,7 +67,7 @@ hn_rndis_rid(struct hn_data *hv)
 
 static void *hn_rndis_alloc(size_t size)
 {
-       return rte_zmalloc("RNDIS", size, PAGE_SIZE);
+       return rte_zmalloc("RNDIS", size, rte_mem_page_size());
 }
 
 #ifdef RTE_LIBRTE_NETVSC_DEBUG_DUMP
@@ -265,18 +265,18 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan,
                return -EINVAL;
        }
 
-       if (unlikely(reqlen > PAGE_SIZE)) {
+       if (unlikely(reqlen > rte_mem_page_size())) {
                PMD_DRV_LOG(ERR, "RNDIS request %u greater than page size",
                            reqlen);
                return -EINVAL;
        }
 
-       sg.page = addr / PAGE_SIZE;
+       sg.page = addr / rte_mem_page_size();
        sg.ofs  = addr & PAGE_MASK;
        sg.len  = reqlen;
 
-       if (sg.ofs + reqlen >  PAGE_SIZE) {
-               PMD_DRV_LOG(ERR, "RNDIS request crosses page bounary");
+       if (sg.ofs + reqlen >  rte_mem_page_size()) {
+               PMD_DRV_LOG(ERR, "RNDIS request crosses page boundary");
                return -EINVAL;
        }
 
@@ -292,7 +292,7 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan,
  */
 static void hn_rndis_link_alarm(void *arg)
 {
-       _rte_eth_dev_callback_process(arg, RTE_ETH_EVENT_INTR_LSC, NULL);
+       rte_eth_dev_callback_process(arg, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 void hn_rndis_link_status(struct rte_eth_dev *dev, const void *msg)
@@ -479,7 +479,7 @@ hn_rndis_query(struct hn_data *hv, uint32_t oid,
                return -ENOMEM;
 
        comp_len = sizeof(*comp) + odlen;
-       comp = rte_zmalloc("QUERY", comp_len, PAGE_SIZE);
+       comp = rte_zmalloc("QUERY", comp_len, rte_mem_page_size());
        if (!comp) {
                error = -ENOMEM;
                goto done;
@@ -736,7 +736,7 @@ hn_rndis_set(struct hn_data *hv, uint32_t oid, const void *data, uint32_t dlen)
        int error;
 
        reqlen = sizeof(*req) + dlen;
-       req = rte_zmalloc("RNDIS_SET", reqlen, PAGE_SIZE);
+       req = rte_zmalloc("RNDIS_SET", reqlen, rte_mem_page_size());
        if (!req)
                return -ENOMEM;
 
@@ -1104,7 +1104,7 @@ hn_rndis_get_eaddr(struct hn_data *hv, uint8_t *eaddr)
        if (error)
                return error;
 
-       PMD_DRV_LOG(INFO, "MAC address %02x:%02x:%02x:%02x:%02x:%02x",
+       PMD_DRV_LOG(INFO, "MAC address " RTE_ETHER_ADDR_PRT_FMT,
                    eaddr[0], eaddr[1], eaddr[2],
                    eaddr[3], eaddr[4], eaddr[5]);
        return 0;