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=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 6EB8AC10F03 for ; Sat, 16 Mar 2019 08:43:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33A64218FC for ; Sat, 16 Mar 2019 08:43:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="u+4r37Cz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726735AbfCPInf (ORCPT ); Sat, 16 Mar 2019 04:43:35 -0400 Received: from kadath.azazel.net ([81.187.231.250]:33112 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726653AbfCPInf (ORCPT ); Sat, 16 Mar 2019 04:43:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kFTLd4RyTSwtClBl1+B0bPl73WM+ngjjww8ws6rkj+U=; b=u+4r37CzB7NNozmBiOs2JCUGNr ZG/AhUwHBEjEP4XHHEoHLBgUZJIvl+ddzblmDLJCEDpN2L9Cg86vMJ//jdp/nP8o5K6G5zJLyyfRM wBHvGnMB9KXXBFeN4yXb/JqAJEJ6hSR6yc4nQq6gZ4tbfL8U6mu8vVsmx0wbfsvxhuR9am8v+aLn3 YduaUJW4Hrjof5C7cxkS58B92Myys36aO0o7vkDuwd/yvxARfZ3caDlyz7acggkpXgTmcDBzdB8EO PZBMML36HBXOCJqBu4hP1kWqREoRJH0Afm2fqoAimqCPY3rFekldzySQh+w0yye+ha4eJqRg/SZXR 4ZMEI9vw==; Received: from ulthar.dreamlands ([192.168.96.2]) by kadath.azazel.net with esmtp (Exim 4.89) (envelope-from ) id 1h54uf-0000Vp-Vp; Sat, 16 Mar 2019 08:43:30 +0000 From: Jeremy Sowden To: netdev@vger.kernel.org Cc: Steffen Klassert , Herbert Xu , "David S. Miller" Subject: [PATCH net v2 2/2] vti4: removed duplicate log message. Date: Sat, 16 Mar 2019 08:43:29 +0000 Message-Id: <20190316084329.31801-3-jeremy@azazel.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190316084329.31801-1-jeremy@azazel.net> References: <20190316084329.31801-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 192.168.96.2 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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: d9ee3444014e ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel") Signed-off-by: Jeremy Sowden --- net/ipv4/ip_vti.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index b6235ca09fa5..35d8346742e2 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -646,10 +646,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); -- 2.20.1