diff options
| author | pravin shelar <pshelar@ovn.org> | 2016-09-19 13:51:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-20 22:54:35 -0400 |
| commit | 2279994d07ab67ff7a1d09bfbd65588332dfb6d8 (patch) | |
| tree | 6d7b081fca05a44e0fd991b35d5c9ed39c74832f /net/openvswitch/flow_netlink.c | |
| parent | 190aa3e77880a05332ea1ccb382a51285d57adb5 (diff) | |
| download | linux-stable-2279994d07ab67ff7a1d09bfbd65588332dfb6d8.tar.gz linux-stable-2279994d07ab67ff7a1d09bfbd65588332dfb6d8.tar.bz2 linux-stable-2279994d07ab67ff7a1d09bfbd65588332dfb6d8.zip | |
openvswitch: avoid resetting flow key while installing new flow.
since commit commit db74a3335e0f6 ("openvswitch: use percpu
flow stats") flow alloc resets flow-key. So there is no need
to reset the flow-key again if OVS is using newly allocated
flow-key.
Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow_netlink.c')
| -rw-r--r-- | net/openvswitch/flow_netlink.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 8efa718ddb5e..ae25ded82b3b 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -1996,13 +1996,15 @@ static int validate_and_copy_sample(struct net *net, const struct nlattr *attr, void ovs_match_init(struct sw_flow_match *match, struct sw_flow_key *key, + bool reset_key, struct sw_flow_mask *mask) { memset(match, 0, sizeof(*match)); match->key = key; match->mask = mask; - memset(key, 0, sizeof(*key)); + if (reset_key) + memset(key, 0, sizeof(*key)); if (mask) { memset(&mask->key, 0, sizeof(mask->key)); @@ -2049,7 +2051,7 @@ static int validate_and_copy_set_tun(const struct nlattr *attr, struct nlattr *a; int err = 0, start, opts_type; - ovs_match_init(&match, &key, NULL); + ovs_match_init(&match, &key, true, NULL); opts_type = ip_tun_from_nlattr(nla_data(attr), &match, false, log); if (opts_type < 0) return opts_type; |