flow: add miniflow_pad_from_64

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

diff --git a/lib/netdev-dpdk.h b/lib/netdev-dpdk.h
index e4ba6fc..646d3e2 100644 (file)
--- a/lib/netdev-dpdk.h
+++ b/lib/netdev-dpdk.h
@@ -3,7 +3,7 @@
 
 #include <config.h>
 
-struct dpif_packet;
+struct dp_packet;
 
 #ifdef DPDK_NETDEV
 
@@ -20,17 +20,25 @@ struct dpif_packet;
 #include <rte_launch.h>
 #include <rte_malloc.h>
 
+#define NON_PMD_CORE_ID LCORE_ID_ANY
+
 int dpdk_init(int argc, char **argv);
 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 *);
+int pmd_thread_setaffinity_cpu(unsigned cpu);
 
 #else
 
+#define NON_PMD_CORE_ID UINT32_MAX
+
+#include "util.h"
+
 static inline int
-dpdk_init(int arg1 OVS_UNUSED, char **arg2 OVS_UNUSED)
+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;
 }
 
@@ -41,22 +49,16 @@ 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)
+pmd_thread_setaffinity_cpu(unsigned cpu OVS_UNUSED)
 {
     return 0;
 }
 
-static inline void
-thread_set_nonpmd(void)
-{
-    /* Nothing */
-}
-
 #endif /* DPDK_NETDEV */
 #endif