From: Nicolas Dichtel Date: Tue, 1 Oct 2013 16:04:59 +0000 (+0200) Subject: sit: allow to use rtnl ops on fb tunnel X-Git-Tag: firefly_0821_release~6453^2~608 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=20300db1bd1b9f45477c7af15b358deb87742bd1;p=firefly-linux-kernel-4.4.55.git sit: allow to use rtnl ops on fb tunnel [ Upstream commit 205983c43700ac3a81e7625273a3fa83cd2759b5 ] rtnl ops where introduced by ba3e3f50a0e5 ("sit: advertise tunnel param via rtnl"), but I forget to assign rtnl ops to fb tunnels. Now that it is done, we must remove the explicit call to unregister_netdevice_queue(), because the fallback tunnel is added to the queue in sit_destroy_tunnels() when checking rtnl_link_ops of all netdevices (this is valid since commit 5e6700b3bf98 ("sit: add support of x-netns")). Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index cf7c754e6ded..0491264b8bfc 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1561,6 +1561,7 @@ static int __net_init sit_init_net(struct net *net) goto err_alloc_dev; } dev_net_set(sitn->fb_tunnel_dev, net); + sitn->fb_tunnel_dev->rtnl_link_ops = &sit_link_ops; err = ipip6_fb_tunnel_init(sitn->fb_tunnel_dev); if (err)