diff options
| author | Pravin B Shelar <pshelar@ovn.org> | 2016-07-17 09:52:11 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@ovn.org> | 2016-07-17 10:25:09 -0700 |
| commit | 2250cb8b4fc4d25e97e1bd609a0e380dab73ab22 (patch) | |
| tree | 7937d844498f049f86b8432b820b40cf958b6cca /datapath | |
| parent | 54125dd05962cf87ef5d19729d1111c244455cf6 (diff) | |
| download | openvswitch-2250cb8b4fc4d25e97e1bd609a0e380dab73ab22.tar.gz | |
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 <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/flow.c | 2 | ||||
| -rw-r--r-- | datapath/flow_netlink.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/datapath/flow.c b/datapath/flow.c index 4e6dfb29e..390286c98 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 6f33926b3..117302d83 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; |