[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:
parent
671a1c7401
commit
cee8947338
3 changed files with 1 additions and 9 deletions
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue