netdev: do not allow devices to be opened with conflicting types

[cascardo/ovs.git] / lib / netdev-dpdk.h

diff --git a/lib/netdev-dpdk.h b/lib/netdev-dpdk.h
index f443a21..80bb834 100644 (file)
--- a/lib/netdev-dpdk.h
+++ b/lib/netdev-dpdk.h
@@ -2,9 +2,9 @@
 #define NETDEV_DPDK_H
 
 #include <config.h>
-#include "ofpbuf.h"
 
-struct dpif_packet;
+struct dp_packet;
+struct smap;
 
 #ifdef DPDK_NETDEV
 
@@ -12,6 +12,7 @@ struct dpif_packet;
 #include <rte_eal.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
+#include <rte_eth_ring.h>
 #include <rte_errno.h>
 #include <rte_memzone.h>
 #include <rte_memcpy.h>
@@ -20,18 +21,17 @@ struct dpif_packet;
 #include <rte_launch.h>
 #include <rte_malloc.h>
 
-int dpdk_init(int argc, char **argv);
+#define NON_PMD_CORE_ID LCORE_ID_ANY
+
 void netdev_dpdk_register(void);
-void free_dpdk_buf(struct dpif_packet *);
-int pmd_thread_setaffinity_cpu(int cpu);
+void free_dpdk_buf(struct dp_packet *);
+void dpdk_set_lcore_id(unsigned cpu);
 
 #else
 
-static inline int
-dpdk_init(int arg1 OVS_UNUSED, char **arg2 OVS_UNUSED)
-{
-    return 0;
-}
+#define NON_PMD_CORE_ID UINT32_MAX
+
+#include "util.h"
 
 static inline void
 netdev_dpdk_register(void)
@@ -40,16 +40,19 @@ netdev_dpdk_register(void)
 }
 
 static inline void
-free_dpdk_buf(struct dpif_packet *buf OVS_UNUSED)
+free_dpdk_buf(struct dp_packet *buf OVS_UNUSED)
 {
     /* Nothing */
 }
 
-static inline int
-pmd_thread_setaffinity_cpu(int cpu OVS_UNUSED)
+static inline void
+dpdk_set_lcore_id(unsigned cpu OVS_UNUSED)
 {
-    return 0;
+    /* Nothing */
 }
 
 #endif /* DPDK_NETDEV */
+
+void dpdk_init(const struct smap *ovs_other_config);
+
 #endif