| Message ID | 1571074671-31834-11-git-send-email-yihung.wei@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Backport upstream conntrack related patches | expand |
LGTM, thanks. Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> On Mon, Oct 14, 2019 at 10:55 AM Yi-Hung Wei <yihung.wei@gmail.com> wrote: > > 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> > --- > datapath/conntrack.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/datapath/conntrack.c b/datapath/conntrack.c > index ba73962b2214..f6e9386f4707 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; > -- > 2.7.4 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index ba73962b2214..f6e9386f4707 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;
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> --- datapath/conntrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)