[IPV6] MROUTE: Do not call ipv6_find_idev() directly.

Since NETDEV_REGISTER notifier chain is responsible for creating
inet6_dev{}, we do not need to call ipv6_find_idev() directly here.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index f6469fb90840c98c530989cf6af527cae3616ede..e7989593142be626d5c73ecc18be5baf0497cd51 100644 (file)
--- 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 e93fa62089f834cd126e6a8308a44c9314da7f5e..9d49ed2578d70119f11ad50d91795f5e3957ca34 100644 (file)
--- 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 94ede696da2a5f8b700543e19b5a85f345400eef..6e2e3c957a315e36168f8c3207c2c85bed3c390a 100644 (file)
--- 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;