From: Ben Pfaff <blp@nicira.com>
Date: Mon, 11 Oct 2010 21:05:37 +0000 (-0700)
Subject: datapath: Fix build break in compat_query_flows().
X-Git-Tag: v1.1.0~1007
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c31abb566dabe942ab2b530409dc807936839b63;p=sliver-openvswitch.git

datapath: Fix build break in compat_query_flows().

Commit a01ef04ce "datapath: Drop padding from struct odp_flow_key" removed
the "reserved" member from struct odp_flow_key but overlooked uses of that
member from 64-bit compatibility code.  This commit fixes up the problem.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 6829ad0bf..9eeb28cd1 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1827,7 +1827,6 @@ static int compat_query_flows(struct datapath *dp, struct compat_odp_flow *flows
 
 		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)