diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-10-01 18:04:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 16:08:30 -0700 |
| commit | 20300db1bd1b9f45477c7af15b358deb87742bd1 (patch) | |
| tree | f19c494599104b5cfce570c7b889e3febeefe735 /net | |
| parent | 23d6f8dd1cc9ca2a3aaed9c6bb24f80b39e071df (diff) | |
| download | linux-3.10-20300db1bd1b9f45477c7af15b358deb87742bd1.tar.gz linux-3.10-20300db1bd1b9f45477c7af15b358deb87742bd1.tar.bz2 linux-3.10-20300db1bd1b9f45477c7af15b358deb87742bd1.zip | |
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 <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/sit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index cf7c754e6de..0491264b8bf 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) |