Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f39dc102 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

ipv6: move in6_dev_finish_destroy() into core kernel 



in6_dev_put() will be needed by vxlan module, so is
in6_dev_finish_destroy().

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e15a00aa

net/ipv6/addrconf.c

+0 −30
Original line number Diff line number Diff line
@@ -304,36 +304,6 @@ err_ip: 
	return -ENOMEM;

}



static void snmp6_free_dev(struct inet6_dev *idev)

{

	kfree(idev->stats.icmpv6msgdev);

	kfree(idev->stats.icmpv6dev);

	snmp_mib_free((void __percpu **)idev->stats.ipv6);

}



/* Nobody refers to this device, we may destroy it. */



void in6_dev_finish_destroy(struct inet6_dev *idev)

{

	struct net_device *dev = idev->dev;



	WARN_ON(!list_empty(&idev->addr_list));

	WARN_ON(idev->mc_list != NULL);

	WARN_ON(timer_pending(&idev->rs_timer));



#ifdef NET_REFCNT_DEBUG

	pr_debug("%s: %s\n", __func__, dev ? dev->name : "NIL");

#endif

	dev_put(dev);

	if (!idev->dead) {

		pr_warn("Freeing alive inet6 device %p\n", idev);

		return;

	}

	snmp6_free_dev(idev);

	kfree_rcu(idev, rcu);

}

EXPORT_SYMBOL(in6_dev_finish_destroy);



static struct inet6_dev *ipv6_add_dev(struct net_device *dev)

{

	struct inet6_dev *ndev;

net/ipv6/addrconf_core.c

+31 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/export.h>

#include <net/ipv6.h>

#include <net/addrconf.h>

#include <net/ip.h>



#define IPV6_ADDR_SCOPE_TYPE(scope)	((scope) << 16)
@@ -117,3 +118,33 @@ const struct in6_addr in6addr_interfacelocal_allrouters = IN6ADDR_INTERFACELOCAL 
EXPORT_SYMBOL(in6addr_interfacelocal_allrouters);

const struct in6_addr in6addr_sitelocal_allrouters = IN6ADDR_SITELOCAL_ALLROUTERS_INIT;

EXPORT_SYMBOL(in6addr_sitelocal_allrouters);



static void snmp6_free_dev(struct inet6_dev *idev)

{

	kfree(idev->stats.icmpv6msgdev);

	kfree(idev->stats.icmpv6dev);

	snmp_mib_free((void __percpu **)idev->stats.ipv6);

}



/* Nobody refers to this device, we may destroy it. */



void in6_dev_finish_destroy(struct inet6_dev *idev)

{

	struct net_device *dev = idev->dev;



	WARN_ON(!list_empty(&idev->addr_list));

	WARN_ON(idev->mc_list != NULL);

	WARN_ON(timer_pending(&idev->rs_timer));



#ifdef NET_REFCNT_DEBUG

	pr_debug("%s: %s\n", __func__, dev ? dev->name : "NIL");

#endif

	dev_put(dev);

	if (!idev->dead) {

		pr_warn("Freeing alive inet6 device %p\n", idev);

		return;

	}

	snmp6_free_dev(idev);

	kfree_rcu(idev, rcu);

}

EXPORT_SYMBOL(in6_dev_finish_destroy);