New upstream version 17.08

[deb_dpdk.git] / drivers / net / af_packet / rte_eth_af_packet.c

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 9ccb7af..9a47852 100644 (file)
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -413,7 +413,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
        if (data_size > buf_size) {
                RTE_LOG(ERR, PMD,
                        "%s: %d bytes will not fit in mbuf (%d bytes)\n",
-                       dev->data->name, data_size, buf_size);
+                       dev->device->name, data_size, buf_size);
                return -ENOMEM;
        }
 
@@ -568,7 +568,12 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
        int rc, tpver, discard;
        int qsockfd = -1;
        unsigned int i, q, rdsize;
-       int fanout_arg __rte_unused, bypass __rte_unused;
+#if defined(PACKET_FANOUT)
+       int fanout_arg;
+#endif
+#if defined(PACKET_QDISC_BYPASS)
+       int bypass;
+#endif
 
        for (k_idx = 0; k_idx < kvlist->count; k_idx++) {
                pair = &kvlist->pairs[k_idx];