Message ID | 1571160473-46132-12-git-send-email-yihung.wei@gmail.com |
---|---|
State | Accepted |
Commit | 337da25b5accc4955ddc75c1ca6737672b5ed900 |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q7F42flb"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46t2rM6B82z9sP4 for <incoming@patchwork.ozlabs.org>; Wed, 16 Oct 2019 04:45:07 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id ECF8AF25; Tue, 15 Oct 2019 17:39:37 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 57CC7F08 for <dev@openvswitch.org>; Tue, 15 Oct 2019 17:39:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EC75C6C5 for <dev@openvswitch.org>; Tue, 15 Oct 2019 17:39:35 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id b128so12952523pfa.1 for <dev@openvswitch.org>; Tue, 15 Oct 2019 10:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g/ow9Jv1aAq/eE1Nh9ICzA36egVAcoLOMRko6R8miqs=; b=q7F42flb+aSE8c2wkyCWZTBsAAQvJnq47NxTVezNXZbnN42uCxbzdlwbU+aDc3qh0T xak+RMCJjhTiChoG3Q2shwC4Vf2TtSbkTr4pPJ521MjypbFj13GGwwQGar40De3jPhEX 2ReLeTpFEh87ZYch/ELsKEgRQ23ieoXhW8iDxqGyw36WWLL0HDkH07DNUm5DPAu61tDX 9eiWopM0A3FpPs4/NXWf3w11m72IlMdnholrnG9B/QBHNI3wzeATEkcjPm8JRmb0i5d9 /hY76nGZlNqiX5eQzg6ovBW8vcDAzwEMv0LvPwVgU5CvnZbb9S7O33c/NQgVQQRsUQp2 2Ewg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=g/ow9Jv1aAq/eE1Nh9ICzA36egVAcoLOMRko6R8miqs=; b=L80qmh3YEfh4KAxtIrVXnBq1e1RNEL5ClCCr37hr85IBbbiJIoeWcsGgZcGocZsCpU DGix8rpkq4fmcIOEfxlPoD6XTFss0CPK7PH0AH7X/wO74XXw5cx451yCOGIQlGvmLMfr vupeo2tIkqwXJw/S7DKVL85ONiaEProbUmnXeIkgRqJqy5mI3fK5Nj53oUOQgjREYPwU Fer9nQcO5HBdntW5vWkYa+M6ywTB5r6SFRH/WsT8BNA2NKecx0b82aiwywtIOVdCLsc/ vY/IRYVq96/17LGDhb/IEppbF08nxuwBBrYYAneUAzcgbbIVwD2Fhn7iwYJSC2aEaa5Z QadQ== X-Gm-Message-State: APjAAAUDBXB3dUWkZBLshtl2bDH2NAgO8iW9sZCCtNeIZaX+L0IW0nOo yDMkyrMjEpElM18DeE2Z5b22uGqEYlA= X-Google-Smtp-Source: APXvYqxFkZh5NwWYZKyhY6d3EV+jcW4eglFcUwfGdD/uzOrtOh2b+i6MVM5XSiXSX6JZYcaa95n87Q== X-Received: by 2002:a17:90a:a00c:: with SMTP id q12mr44484629pjp.102.1571161175110; Tue, 15 Oct 2019 10:39:35 -0700 (PDT) Received: from Husky.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id q204sm25590311pfc.11.2019.10.15.10.39.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Oct 2019 10:39:33 -0700 (PDT) From: Yi-Hung Wei <yihung.wei@gmail.com> To: dev@openvswitch.org Date: Tue, 15 Oct 2019 10:27:52 -0700 Message-Id: <1571160473-46132-12-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571160473-46132-1-git-send-email-yihung.wei@gmail.com> References: <1571160473-46132-1-git-send-email-yihung.wei@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 11/12] datapath: Fix log message in ovs conntrack X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org |
Series |
Backport upstream conntrack related patches
|
expand
|
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;