summaryrefslogtreecommitdiff
path: root/datapath
diff options
context:
space:
mode:
authorYi-Hung Wei <yihung.wei@gmail.com>2019-10-15 10:27:52 -0700
committerBen Pfaff <blp@ovn.org>2019-10-18 10:55:47 -0700
commit337da25b5accc4955ddc75c1ca6737672b5ed900 (patch)
treedbe17ca314ad5fb4798d1436a130a67c793414a8 /datapath
parent0b26ee1b475b5395a7a3fe79defeb4928d1e5a6f (diff)
downloadopenvswitch-337da25b5accc4955ddc75c1ca6737672b5ed900.tar.gz
datapath: Fix log message in ovs conntrack
Upstream commit: commit 12c6bc38f99bb168b7f16bdb5e855a51a23ee9ec Author: Yi-Hung Wei <yihung.wei@gmail.com> Date: Wed Aug 21 17:16:10 2019 -0700 openvswitch: Fix log message in ovs conntrack Fixes: 06bd2bdf19d2 ("openvswitch: Add timeout support to ct action") Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com> Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'datapath')
-rw-r--r--datapath/conntrack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c
index ba73962b2..f6e9386f4 100644
--- a/datapath/conntrack.c
+++ b/datapath/conntrack.c
@@ -1663,7 +1663,7 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
case OVS_CT_ATTR_TIMEOUT:
memcpy(info->timeout, nla_data(a), nla_len(a));
if (!memchr(info->timeout, '\0', nla_len(a))) {
- OVS_NLERR(log, "Invalid conntrack helper");
+ OVS_NLERR(log, "Invalid conntrack timeout");
return -EINVAL;
}
break;