Commit cee89473 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[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: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 671a1c74

include/linux/mroute6.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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)

{

{

net/ipv6/addrconf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

net/ipv6/ip6mr.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -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;