datapath: Fix build break in compat_query_flows().
authorBen Pfaff <blp@nicira.com>
Mon, 11 Oct 2010 21:05:37 +0000 (14:05 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 11 Oct 2010 21:20:22 +0000 (14:20 -0700)
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>
datapath/datapath.c

index 6829ad0bf88b1c1ffbca9bfd563a994662e2353d..9eeb28cd1d12c04be4253c94e1f575ea6f52535e 100644 (file)
@@ -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)