From dc2700c2547199f36d22d8af8ecb87e11a037253 Mon Sep 17 00:00:00 2001 From: William Tu Date: Fri, 27 Jul 2018 09:30:09 -0700 Subject: [PATCH] compat: ip6_tunnel: improve error message. When loading compact ip6 tunnel, if the system already loads upstream kernel's ip6 tunnel, print error message before return. Signed-off-by: William Tu Cc: Greg Rose Signed-off-by: Ben Pfaff --- datapath/linux/compat/ip6_tunnel.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/datapath/linux/compat/ip6_tunnel.c b/datapath/linux/compat/ip6_tunnel.c index 7c66787967f..56fd8b4dd34 100644 --- a/datapath/linux/compat/ip6_tunnel.c +++ b/datapath/linux/compat/ip6_tunnel.c @@ -2158,8 +2158,11 @@ int rpl_ip6_tunnel_init(void) return -EOPNOTSUPP; #endif err = register_pernet_device(&ip6_tnl_net_ops); - if (err < 0) + if (err < 0) { + pr_err("%s: can't register ip6_tnl pernet device\n", + __func__); goto out_pernet; + } err = xfrm6_tunnel_register(&ip4ip6_handler, AF_INET); if (err < 0) { @@ -2172,10 +2175,13 @@ int rpl_ip6_tunnel_init(void) pr_err("%s: can't register ip6ip6\n", __func__); goto out_ip6ip6; } + err = rtnl_link_register(&ip6_link_ops); - if (err < 0) + if (err < 0) { + pr_err("%s: can't register ip6_lin_ops\n", + __func__); goto rtnl_link_failed; - + } return 0; rtnl_link_failed: