Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 205983c4 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

sit: allow to use rtnl ops on fb tunnel 



rtnl ops where introduced by ba3e3f50 ("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 5e6700b3 ("sit: add support of x-netns")).

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cb17124

net/ipv6/sit.c

+1 −1
Original line number Diff line number Diff line
@@ -1666,6 +1666,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;

	/* FB netdevice is special: we have one, and only one per netns.

	 * Allowing to move it to another netns is clearly unsafe.

	 */
@@ -1700,7 +1701,6 @@ static void __net_exit sit_exit_net(struct net *net) 


	rtnl_lock();

	sit_destroy_tunnels(sitn, &list);

	unregister_netdevice_queue(sitn->fb_tunnel_dev, &list);

	unregister_netdevice_many(&list);

	rtnl_unlock();

}