OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
YOSHIFUJI Hideaki 2008-04-13 23:21:16 -07:00 committed by David S. Miller
parent 671a1c7401
commit cee8947338
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/mroute6.h
View File

@ -117,9 +117,6 @@ struct sioc_mif_req6
#include <linux/skbuff.h> /* for struct sk_buff_head */ #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 #ifdef CONFIG_IPV6_MROUTE
static inline int ip6_mroute_opt(int opt) static inline int ip6_mroute_opt(int opt)
{ {

2
net/ipv6/addrconf.c
View File

@ -412,7 +412,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
return ndev; 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; struct inet6_dev *idev;

5
net/ipv6/ip6mr.c
View File

@ -435,7 +435,6 @@ static void reg_vif_setup(struct net_device *dev)
static struct net_device *ip6mr_reg_vif(void) static struct net_device *ip6mr_reg_vif(void)
{ {
struct net_device *dev; struct net_device *dev;
struct inet6_dev *in_dev;
dev = alloc_netdev(sizeof(struct net_device_stats), "pim6reg", dev = alloc_netdev(sizeof(struct net_device_stats), "pim6reg",
reg_vif_setup); reg_vif_setup);
@ -449,10 +448,6 @@ static struct net_device *ip6mr_reg_vif(void)
} }
dev->iflink = 0; dev->iflink = 0;
in_dev = ipv6_find_idev(dev);
if (!in_dev)
goto failure;
if (dev_open(dev)) if (dev_open(dev))
goto failure; goto failure;