From 2250cb8b4fc4d25e97e1bd609a0e380dab73ab22 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Sun, 17 Jul 2016 09:52:11 -0700 Subject: [PATCH] datapath: Move key memset to ovs_flow_key_extract_userspace() Synchronize code with upstream ovs_nla_get_flow_metadata(). Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/flow.c | 2 ++ datapath/flow_netlink.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/datapath/flow.c b/datapath/flow.c index 4e6dfb29ea8..390286c9889 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -732,6 +732,8 @@ int ovs_flow_key_extract_userspace(struct net *net, const struct nlattr *attr, { int err; + memset(key, 0, OVS_SW_FLOW_KEY_METADATA_SIZE); + /* Extract metadata from netlink attributes. */ err = ovs_nla_get_flow_metadata(net, attr, key, log); if (err) diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 6f33926b3e4..117302d8305 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1406,7 +1406,6 @@ int ovs_nla_get_flow_metadata(struct net *net, const struct nlattr *attr, memset(&match, 0, sizeof(match)); match.key = key; - memset(key, 0, OVS_SW_FLOW_KEY_METADATA_SIZE); memset(&key->ct, 0, sizeof(key->ct)); key->phy.in_port = DP_MAX_PORTS;