3 files changed, 1 insertions, 9 deletions

diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index f6469fb90840..e7989593142b 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -117,9 +117,6 @@ struct sioc_mif_req6
 
 #include <linux/skbuff.h>       /* for struct sk_buff_head */
 
-struct net_device;
-struct inet6_dev *ipv6_find_idev(struct net_device *dev);
-
 #ifdef CONFIG_IPV6_MROUTE
 static inline int ip6_mroute_opt(int opt)
 {
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e93fa62089f8..9d49ed2578d7 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -412,7 +412,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
         return ndev;
 }
 
-struct inet6_dev * ipv6_find_idev(struct net_device *dev)
+static struct inet6_dev * ipv6_find_idev(struct net_device *dev)
 {
         struct inet6_dev *idev;
 
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 94ede696da2a..6e2e3c957a31 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -435,7 +435,6 @@ static void reg_vif_setup(struct net_device *dev)
 static struct net_device *ip6mr_reg_vif(void)
 {
         struct net_device *dev;
-        struct inet6_dev *in_dev;
 
         dev = alloc_netdev(sizeof(struct net_device_stats), "pim6reg",
                            reg_vif_setup);
@@ -449,10 +448,6 @@ static struct net_device *ip6mr_reg_vif(void)
         }
         dev->iflink = 0;
 
-        in_dev = ipv6_find_idev(dev);
-        if (!in_dev)
-                goto failure;
-
         if (dev_open(dev))
                 goto failure;