datapath: Fix build when CONFIG_COMPAT is enabled.

These are stragglers from the last merge from "master" that I didn't catch
at the time because I didn't build on top of a 64-bit kernel.

diff --git a/datapath/datapath.c b/datapath/datapath.c
index b1d69a1..702750f 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1874,7 +1874,6 @@ static int compat_query_flows(struct datapath *dp, struct compat_xflow_flow *flo
 
                if (compat_get_flow(&uf, ufp))
                        return -EFAULT;
-               memset(uf.key.reserved, 0, sizeof uf.key.reserved);
 
                flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp);
                if (!flow_node)

diff --git a/datapath/xflow-compat.h b/datapath/xflow-compat.h
index 7cffe27..48ef846 100644 (file)
--- a/datapath/xflow-compat.h
+++ b/datapath/xflow-compat.h
@@ -11,8 +11,9 @@
 
 /* 32-bit ioctl compatibility definitions for datapath protocol. */
 
+#include "openvswitch/xflow.h"
+
 #ifdef CONFIG_COMPAT
-#include "openvswitch/datapath-protocol.h"
 #include <linux/compat.h>
 
 #define XFLOW_PORT_LIST32              _IOWR('O', 10, struct compat_xflow_portvec)