1 files changed, 7 insertions, 8 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 85b18319e2d8..43fd9cfa7b11 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -209,8 +209,6 @@ static int ipip6_tunnel_create(struct net_device *dev)
 
         ipip6_tunnel_clone_6rd(dev, sitn);
 
-        dev_hold(dev);
-
         ipip6_tunnel_link(sitn, t);
         return 0;
 
@@ -1393,7 +1391,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
                 dev->tstats = NULL;
                 return err;
         }
-
+        dev_hold(dev);
         return 0;
 }
 
@@ -1409,7 +1407,6 @@ static void __net_init ipip6_fb_tunnel_init(struct net_device *dev)
         iph->ihl                = 5;
         iph->ttl                = 64;
 
-        dev_hold(dev);
         rcu_assign_pointer(sitn->tunnels_wc[0], tunnel);
 }
 
@@ -1582,8 +1579,11 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev,
         }
 
 #ifdef CONFIG_IPV6_SIT_6RD
-        if (ipip6_netlink_6rd_parms(data, &ip6rd))
+        if (ipip6_netlink_6rd_parms(data, &ip6rd)) {
                 err = ipip6_tunnel_update_6rd(nt, &ip6rd);
+                if (err < 0)
+                        unregister_netdevice_queue(dev, NULL);
+        }
 #endif
 
         return err;
@@ -1801,9 +1801,9 @@ static void __net_exit sit_destroy_tunnels(struct net *net,
                 if (dev->rtnl_link_ops == &sit_link_ops)
                         unregister_netdevice_queue(dev, head);
 
-        for (prio = 1; prio < 4; prio++) {
+        for (prio = 0; prio < 4; prio++) {
                 int h;
-                for (h = 0; h < IP6_SIT_HASH_SIZE; h++) {
+                for (h = 0; h < (prio ? IP6_SIT_HASH_SIZE : 1); h++) {
                         struct ip_tunnel *t;
 
                         t = rtnl_dereference(sitn->tunnels[prio][h]);
@@ -1858,7 +1858,6 @@ static int __net_init sit_init_net(struct net *net)
         return 0;
 
 err_reg_dev:
-        ipip6_dev_free(sitn->fb_tunnel_dev);
         free_netdev(sitn->fb_tunnel_dev);
 err_alloc_dev:
         return err;