diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-05 12:21:10 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-05 12:21:10 -0700 |
| commit | 4ce7ea0bfbb301ffb79154b6cecd2ef030db4cdf (patch) | |
| tree | a7ad87580793912a9da208e7a9ea21d6c7768f08 /net/ipv6 | |
| parent | 4450182f400f1a5f50b1680faec25af2315c2849 (diff) | |
| parent | 7c4bc9c2662c6d9840afed0e29eb01314af9bb78 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38
Conflicts:
arch/arm/kernel/signal.c
drivers/mmc/card/block.c
drivers/mtd/nand/Kconfig
include/linux/amba/mmci.h
kernel/printk.c
mm/shmem.c
net/socket.c
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index fd6782e3a03..62c96253c36 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -87,6 +87,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <trace/ipv6.h> /* Set to 3 to get tracing... */ #define ACONF_DEBUG 2 @@ -108,6 +109,9 @@ static inline u32 cstamp_delta(unsigned long cstamp) #define ADDRCONF_TIMER_FUZZ (HZ / 4) #define ADDRCONF_TIMER_FUZZ_MAX (HZ) +DEFINE_TRACE(ipv6_addr_add); +DEFINE_TRACE(ipv6_addr_del); + #ifdef CONFIG_SYSCTL static void addrconf_sysctl_register(struct inet6_dev *idev); static void addrconf_sysctl_unregister(struct inet6_dev *idev); @@ -676,6 +680,8 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen, /* For caller */ in6_ifa_hold(ifa); + trace_ipv6_addr_add(ifa); + /* Add to big hash table */ hash = ipv6_addr_hash(addr); @@ -2212,6 +2218,7 @@ static int inet6_addr_del(struct net *net, int ifindex, struct in6_addr *pfx, in6_ifa_hold(ifp); read_unlock_bh(&idev->lock); + trace_ipv6_addr_del(ifp); ipv6_del_addr(ifp); /* If the last address is deleted administratively, |