From: Jeremy Sowden Date: Tue, 19 Mar 2019 15:39:21 +0000 (+0000) Subject: vti4: removed duplicate log message. X-Git-Tag: v4.9.221~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dd76d055170b4cf5bd3408099fa14b1c9cb1b9b;p=platform%2Fkernel%2Flinux-amlogic.git vti4: removed duplicate log message. 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 --- diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 58e0dab06f19..8afb67a48409 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -696,10 +696,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);