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 694899c..80bb834 100644 (file)
--- a/lib/netdev-dpdk.h
+++ b/lib/netdev-dpdk.h
@@ -3,12 +3,8 @@
 
 #include <config.h>
 
-struct dpif_packet;
-
-/* Reserves cpu core 0 for all non-pmd threads.  Changing the value of this
- * macro will allow pmd thread to be pinned on cpu core 0.  This may not be
- * ideal since the core may be non-isolated. */
-#define NON_PMD_CORE_ID 0
+struct dp_packet;
+struct smap;
 
 #ifdef DPDK_NETDEV
 
@@ -25,24 +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 thread_set_nonpmd(void);
+void free_dpdk_buf(struct dp_packet *);
+void dpdk_set_lcore_id(unsigned cpu);
 
 #else
 
-#include "util.h"
+#define NON_PMD_CORE_ID UINT32_MAX
 
-static inline int
-dpdk_init(int argc, char **argv)
-{
-    if (argc >= 2 && !strcmp(argv[1], "--dpdk")) {
-        ovs_fatal(0, "DPDK support not built into this copy of Open vSwitch.");
-    }
-    return 0;
-}
+#include "util.h"
 
 static inline void
 netdev_dpdk_register(void)
@@ -51,22 +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)
-{
-    return 0;
-}
-
 static inline void
-thread_set_nonpmd(void)
+dpdk_set_lcore_id(unsigned cpu OVS_UNUSED)
 {
     /* Nothing */
 }
 
 #endif /* DPDK_NETDEV */
+
+void dpdk_init(const struct smap *ovs_other_config);
+
 #endif