On Fri, Jul 27, 2018 at 01:43:54PM -0700, Gregory Rose wrote: > On 7/27/2018 9:30 AM, William Tu wrote: > >When loading compact ip6 tunnel, if the system already loads upstream > s/compact/compat/ > > >kernel's ip6 tunnel, print error message before return. > > > >Signed-off-by: William Tu <[email protected]> > >Cc: Greg Rose <[email protected]> > >--- > > 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 7c66787967f6..56fd8b4dd342 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", > > s/ip6_lin_ops/ip6_link_ops/ > > >+ __func__); > > goto rtnl_link_failed; > >- > >+ } > > return 0; > > rtnl_link_failed: > > Other than a couple of spelling nits it looks good. > > Thanks William! Aren't you supposed to be on vacation? ;^) > > Reviewed-by: Greg Rose <[email protected]>
Applied to master, thanks William and Greg. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
