From patchwork Fri May 1 13:20:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E47BBC47254 for ; Fri, 1 May 2020 13:57:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4DF120757 for ; Fri, 1 May 2020 13:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588341439; bh=8W+mS+4KNAyt89VJ47VSSUkuTmeWZ88gzkFrVaY//7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kRmRiCYsnSicwdtPBKtc/fcAnilyVon8IJlgQb1wY4arPdRVtCq3RAhNDevRJD7rY tm2QwTARNY0Yo6J6ukULjnJt23H5Y/PVIstmqHIPXA7+XVMCVR8eguor60YLuvwL7t Q95eVOI0EB0sR2FcDYSoicbTSbs8lciXgFKxiJYg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730142AbgEANb3 (ORCPT ); Fri, 1 May 2020 09:31:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:56092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730141AbgEANb3 (ORCPT ); Fri, 1 May 2020 09:31:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 406B5208D6; Fri, 1 May 2020 13:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339888; bh=8W+mS+4KNAyt89VJ47VSSUkuTmeWZ88gzkFrVaY//7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WLtSpdXuP7RN3MQMb0UJaSiQu3jdi3Z8tdNExaysw4MfhqzIGkxU9czrIz9/lZER2 LvA1IoKSQ8YYHYQ68AMb3FwBKCaBuM2gyxOH8CIk9Wcixuw2gJSaQ5aU2ivZbLZNit NPr2DGJqo3dJHtn49j9wlgmiftf37fFIToUFBLCE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Sowden , Steffen Klassert , Guenter Roeck Subject: [PATCH 4.14 007/117] vti4: removed duplicate log message. Date: Fri, 1 May 2020 15:20:43 +0200 Message-Id: <20200501131546.093875367@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131544.291247695@linuxfoundation.org> References: <20200501131544.291247695@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeremy Sowden commit 01ce31c57b3f07c91c9d45bbaf126124cce83a5d upstream. Removed info log-message if ipip tunnel registration fails during module-initialization: it adds nothing to the error message that is written on all failures. Fixes: dd9ee3444014e ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel") Signed-off-by: Jeremy Sowden Signed-off-by: Steffen Klassert Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_vti.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -681,10 +681,8 @@ static int __init vti_init(void) msg = "ipip tunnel"; err = xfrm4_tunnel_register(&ipip_handler, AF_INET); - if (err < 0) { - pr_info("%s: cant't register tunnel\n",__func__); + if (err < 0) goto xfrm_tunnel_failed; - } msg = "netlink interface"; err = rtnl_link_register(&vti_link_ops);