From patchwork Mon Oct 14 17:37:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 1176570 Return-Path: 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=) 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="CGqjBjD+"; 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 46sR6m2TLTz9sP4 for ; Tue, 15 Oct 2019 04:55:28 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3B5362791; Mon, 14 Oct 2019 17:50:06 +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 446E12771 for ; Mon, 14 Oct 2019 17:50:03 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3B3F68AD for ; Mon, 14 Oct 2019 17:50:02 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id h195so10800262pfe.5 for ; Mon, 14 Oct 2019 10:50:02 -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=jEQWEs8VF9oy23PtblP8LpgiJKyzpSofG9lspi2q1ZU=; b=CGqjBjD+SgZtrGcRVmA1ye7nryxTODKP+/e/QGoFMtbZEysdPRSvzHBYERS4NbHC+J VFDB6/9MZjHr5VIXhuCg/d09NYNuTtHT5K8pHkTXM5wuTRjFTBujJch0oKSl0CyrddzE W9pNCX/eYsvN6QFbneL8ZIsfl0ALE4k8gAz4AwMs2flaGffMBIpRyCXm7/o2KPkIYP1Q fx3khH6GEY/hOzoi1bTXkQ87wOh/h1oX6ISkKSog7rzKUaApc4zRSozBoAlEUM2+yMPP z4COdhdCspfQt3Zs5QMm9QOiHsfy/giX98OKJBbcIVsi3BrUZ+PX21x8wNDcIOwvgulM rklg== 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=jEQWEs8VF9oy23PtblP8LpgiJKyzpSofG9lspi2q1ZU=; b=pNH130F6BoK8UNSKVNXd8KnxgNLlyNBFPF5qrFxNp11oKPccefbGEyGf90tdej2Tn1 1AtQCrfPz7i4la60o/xo0IPCFINpWOJThSKw/EIJDNGO/bCh/CEl8q/xXkmeJipLZjze RUQZNW35kERzQ728VdJLz6z2erGFahnmSOiL4RofbSMz6+ERClrsKkwTmIxo1vzudc8k J7iU7hkRS6GTJ6Yqy3/E4Dqm+qEorF4K9ewRlCvm2vibncc+90rHn/2OL5DbHoyVw/a1 uxfBx8CkccDv/6QfpaybZyATAGFrxK3dCXugRbsKIzsSZF9ZBfywzr+IpNAceY/hQDgD uTWw== X-Gm-Message-State: APjAAAW+u/wqrrrxgFWuHYsm4lHthISv83AfSSPlgh5JIlCUUwpSMTOq bdl9Ci6L9A+fuoYBfWfHer9I8AtAlVA= X-Google-Smtp-Source: APXvYqy9cxsjU2mSNdEkYRvZ8uE92W41hKY4iejx1L4kdE6ZkvLqDMfvAHYskldWJnQTcufKq9vykA== X-Received: by 2002:a17:90a:a6c:: with SMTP id o99mr36773229pjo.139.1571075401278; Mon, 14 Oct 2019 10:50:01 -0700 (PDT) Received: from Husky.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id n23sm16849700pff.137.2019.10.14.10.49.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Oct 2019 10:50:00 -0700 (PDT) From: Yi-Hung Wei To: dev@openvswitch.org Date: Mon, 14 Oct 2019 10:37:50 -0700 Message-Id: <1571074671-31834-11-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571074671-31834-1-git-send-email-yihung.wei@gmail.com> References: <1571074671-31834-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 10/11] datapath: Fix log message in ovs conntrack X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Upstream commit: commit 12c6bc38f99bb168b7f16bdb5e855a51a23ee9ec Author: Yi-Hung Wei 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 Signed-off-by: David S. Miller Signed-off-by: Yi-Hung Wei Reviewed-by: Yifeng Sun --- 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;