From patchwork Mon Sep 11 21:10:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812621 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZqcG3csK"; 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 3xrgdv5N5nz9s8J for ; Tue, 12 Sep 2017 07:13:55 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E6967CBF; Mon, 11 Sep 2017 21:11:22 +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 83F26CB6 for ; Mon, 11 Sep 2017 21:11:20 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0BDECA4 for ; Mon, 11 Sep 2017 21:11:19 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id j16so2096404pga.2 for ; Mon, 11 Sep 2017 14:11:19 -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=0+aUV5igeT+9+FLHYM4g+qIb6RSjylqrQrjIkbzhqlA=; b=ZqcG3csK3cs+o6rZi+1bLu/6dmuLCKo8RE9TPKhn83pZZ1LwHeogD0IDAL1xO0rxPM u3RaYzftD3wPksML7n9GhkIOyUJ5ea+zNI0h7ZdVSuKZFLFFCGBxx3ixNoiPbVkCkiqu wkbyl0E5pVQKaVBVZXl4Aok96K82FlZjwBrZSfElGwaLHYsvfiMOeWySGQI9xQi0dSLc 5OVNw8IAB5VnQDwo6I/9FI/ZAx07V9x+dAqnQAWiYnqxUXdKIRJKlFSqhVRu2DJjfcCS LfSD/fE0qNRG5Q2cvbaotoq+sxrrbxNweLgUfxdHSUojfstf6ooMDRsKZGTQJrJ4vvdE bDcg== 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=0+aUV5igeT+9+FLHYM4g+qIb6RSjylqrQrjIkbzhqlA=; b=imDJEBq8YbKx+tvgqfRZFRW2z9VhHHUkYFdCiD2I3EgCCDnmJ8HS/RIcIFdbTZlTPQ Lu22MNLRr7R8wvx1XoWNhTz0jBlcAgPAr99jUjLx5//umMubcTAtgFUvnKD631AYqB4w Rb0dPGfSwBNu3GVGLfP8ig8t5RcWjd/jWJ25nLqoZu9y61Yzhbipmsx3SF8Ad6EEYQEJ QNTFLrQ7GwYqdHENUM6TMAfDZX126b+9HEO8P6ntEkibvcPqHqabif4X8L8gPBiLKo3I GcfjM3sQ2HZZwe9SmH6F6fAwwbCdZbLldADLdk1o2ZepUMh2C5mX633Q5wzwPO7fvLGU FrtQ== X-Gm-Message-State: AHPjjUicBCGphAclo0SSnqKDA/3R7OTvUa+6b4AGaloTINquy4JQYgOz 8bTWBqeNaGlLQ/dG X-Google-Smtp-Source: ADKCNb5/gCVfEvHPNF3+lcCSDmutGQa1UsXDdkPoU7FscOATqJptEW/aEDF8autdyFN3bkeDM8DVew== X-Received: by 10.99.165.88 with SMTP id r24mr12837914pgu.331.1505164279208; Mon, 11 Sep 2017 14:11:19 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id q23sm6568745pfk.182.2017.09.11.14.11.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 14:11:18 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 14:10:58 -0700 Message-Id: <1505164269-9455-5-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505164269-9455-1-git-send-email-gvrose8192@gmail.com> References: <1505164269-9455-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled 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 05/16] datapath: Remove unnecessary newlines from OVS_NLERR uses 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 0ed80da518a1f27562a013f106505e495e891fe4 Author: Joe Perches Date: Fri Aug 11 04:26:26 2017 -0700 openvswitch: Remove unnecessary newlines from OVS_NLERR uses OVS_NLERR already adds a newline so these just add blank lines to the logging. Signed-off-by: Joe Perches Acked-by: Joe Stringer Signed-off-by: David S. Miller Signed-off-by: Greg Rose --- datapath/conntrack.c | 14 +++++--------- datapath/flow_netlink.c | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index b645ab1..d517a87 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -1221,15 +1221,13 @@ static int parse_nat(const struct nlattr *attr, int type = nla_type(a); if (type > OVS_NAT_ATTR_MAX) { - OVS_NLERR(log, - "Unknown NAT attribute (type=%d, max=%d).\n", + OVS_NLERR(log, "Unknown NAT attribute (type=%d, max=%d)", type, OVS_NAT_ATTR_MAX); return -EINVAL; } if (nla_len(a) != ovs_nat_attr_lens[type][ip_vers]) { - OVS_NLERR(log, - "NAT attribute type %d has unexpected length (%d != %d).\n", + OVS_NLERR(log, "NAT attribute type %d has unexpected length (%d != %d)", type, nla_len(a), ovs_nat_attr_lens[type][ip_vers]); return -EINVAL; @@ -1239,9 +1237,7 @@ static int parse_nat(const struct nlattr *attr, case OVS_NAT_ATTR_SRC: case OVS_NAT_ATTR_DST: if (info->nat) { - OVS_NLERR(log, - "Only one type of NAT may be specified.\n" - ); + OVS_NLERR(log, "Only one type of NAT may be specified"); return -ERANGE; } info->nat |= OVS_CT_NAT; @@ -1291,13 +1287,13 @@ static int parse_nat(const struct nlattr *attr, break; default: - OVS_NLERR(log, "Unknown nat attribute (%d).\n", type); + OVS_NLERR(log, "Unknown nat attribute (%d)", type); return -EINVAL; } } if (rem > 0) { - OVS_NLERR(log, "NAT attribute has %d unknown bytes.\n", rem); + OVS_NLERR(log, "NAT attribute has %d unknown bytes", rem); return -EINVAL; } if (!info->nat) { diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 9b48612..df9d88e 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1257,7 +1257,7 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match, } if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) { - OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n", + OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x)", ntohl(ipv6_key->ipv6_label), (1 << 20) - 1); return -EINVAL; }