summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJeremy Sowden <jeremy@azazel.net>2019-03-19 18:39:21 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-29 17:31:08 +0300
commitbe2b6b4a22013ce7016388b276a6a9b147bb0a24 (patch)
tree44d2d4d7b8422b041427bbb5cb22d71a16d786ac /net
parent259ea41f36044fd323a04aeca14ecd7b87797837 (diff)
downloadlinux-be2b6b4a22013ce7016388b276a6a9b147bb0a24.tar.xz
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 <jeremy@azazel.net> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_vti.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index ccb1d97dfa05..d4c4eabd02b6 100644
--- 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);