blob: eb1fd821c8cd4f98714e0e391595eb28766e1609 [file] [log] [blame]
From 821cff578ba968f929e96b4bde8f2880e2280cfc Mon Sep 17 00:00:00 2001
From: Yi-Hung Wei <yihung.wei@gmail.com>
Date: Wed, 21 Aug 2019 17:16:10 -0700
Subject: [PATCH] openvswitch: Fix log message in ovs conntrack
commit 12c6bc38f99bb168b7f16bdb5e855a51a23ee9ec upstream.
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: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 67e60a5e42d5..1d418d1eef5d 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -1585,7 +1585,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;
--
2.27.0