From mboxrd@z Thu Jan 1 00:00:00 1970 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=ham 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 502ABC83000 for ; Tue, 28 Apr 2020 18:59:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2236620575 for ; Tue, 28 Apr 2020 18:59:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588100368; bh=P6jXdtiM2P12sUoZgceri2ClraTQWPxOWn+nWO+mJ5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sk6bFboz3XYgyQpqDrM+U6ywiVgsztZbXq/1lQRP/oRW8kx7O28rK/Gm/S4OJqdkY OVI2i7Nk3zZciYL9d8pbhrDogMi01PX6+HDm/cAWOuSR6Dt8A2qo18RFT0ywfi5ht+ Wxrur0aspVflYUeUezl+tB6/yLl5Y+WhERBdukCA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729524AbgD1S70 (ORCPT ); Tue, 28 Apr 2020 14:59:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:41462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728671AbgD1S2c (ORCPT ); Tue, 28 Apr 2020 14:28:32 -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 7966F208E0; Tue, 28 Apr 2020 18:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098511; bh=P6jXdtiM2P12sUoZgceri2ClraTQWPxOWn+nWO+mJ5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KbVa0UbZMjFj8IVRznvnmeYsTXnKHuj4QJfmwg6syeJwOHbx8xCcbpdRYrPyhj5sR R5pFwvw4qdJIaczAG+VKsck3lP23dYLFmwI0xWoIhCHyCTZGjU9PXnsak+Fc6XWt9X yJQL3m9eCXVLrGNXRyE/w/zjAyFx10P+vZBcXj10= 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.19 005/131] vti4: removed duplicate log message. Date: Tue, 28 Apr 2020 20:23:37 +0200 Message-Id: <20200428182226.007648856@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182224.822179290@linuxfoundation.org> References: <20200428182224.822179290@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -677,10 +677,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);