aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-04-14 02:21:16 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-14 02:21:16 -0400
commitcee8947338d46bccece54c752bf6cd4043035f05 (patch)
tree3f1e30d20e75e66ebb22f9612d9eb64f2e1a8c48
parent671a1c7401c6e48f5f2a77ac330727a13a9c8b63 (diff)
[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>
-rw-r--r--include/linux/mroute6.h3
-rw-r--r--net/ipv6/addrconf.c2
-rw-r--r--net/ipv6/ip6mr.c5
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
117 117
118#include <linux/skbuff.h> /* for struct sk_buff_head */ 118#include <linux/skbuff.h> /* for struct sk_buff_head */
119 119
120struct net_device;
121struct inet6_dev *ipv6_find_idev(struct net_device *dev);
122
123#ifdef CONFIG_IPV6_MROUTE 120#ifdef CONFIG_IPV6_MROUTE
124static inline int ip6_mroute_opt(int opt) 121static inline int ip6_mroute_opt(int opt)
125{ 122{
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)
412 return ndev; 412 return ndev;
413} 413}
414 414
415struct inet6_dev * ipv6_find_idev(struct net_device *dev) 415static struct inet6_dev * ipv6_find_idev(struct net_device *dev)
416{ 416{
417 struct inet6_dev *idev; 417 struct inet6_dev *idev;
418 418
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)
435static struct net_device *ip6mr_reg_vif(void) 435static struct net_device *ip6mr_reg_vif(void)
436{ 436{
437 struct net_device *dev; 437 struct net_device *dev;
438 struct inet6_dev *in_dev;
439 438
440 dev = alloc_netdev(sizeof(struct net_device_stats), "pim6reg", 439 dev = alloc_netdev(sizeof(struct net_device_stats), "pim6reg",
441 reg_vif_setup); 440 reg_vif_setup);
@@ -449,10 +448,6 @@ static struct net_device *ip6mr_reg_vif(void)
449 } 448 }
450 dev->iflink = 0; 449 dev->iflink = 0;
451 450
452 in_dev = ipv6_find_idev(dev);
453 if (!in_dev)
454 goto failure;
455
456 if (dev_open(dev)) 451 if (dev_open(dev))
457 goto failure; 452 goto failure;
458 453