diff options
author | David S. Miller <davem@davemloft.net> | 2011-12-26 15:24:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-26 15:24:36 -0500 |
commit | c159d30c59dc84934f8ef46f934ce1232c558ecd (patch) | |
tree | b3ad64130eee7237f41813c42f588c1c516d3d53 /net/ipv6 | |
parent | e143a1ada39110f9596e4ffd4e0b8399e5ab88d4 (diff) |
ipv6: Kill useless route tracing bits in net/ipv6/route.c
RDBG() wasn't even used, and the messages printed by RT6_DEBUG() were
far from useful. Just get rid of all this stuff, we can replace it
with something more suitable if we want.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/route.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 5855e9ede3cb..35b07cc33aad 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -62,17 +62,6 @@ | |||
62 | #include <linux/sysctl.h> | 62 | #include <linux/sysctl.h> |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | /* Set to 3 to get tracing. */ | ||
66 | #define RT6_DEBUG 2 | ||
67 | |||
68 | #if RT6_DEBUG >= 3 | ||
69 | #define RDBG(x) printk x | ||
70 | #define RT6_TRACE(x...) printk(KERN_DEBUG x) | ||
71 | #else | ||
72 | #define RDBG(x) | ||
73 | #define RT6_TRACE(x...) do { ; } while (0) | ||
74 | #endif | ||
75 | |||
76 | static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort, | 65 | static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort, |
77 | const struct in6_addr *dest); | 66 | const struct in6_addr *dest); |
78 | static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie); | 67 | static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie); |
@@ -518,9 +507,6 @@ static struct rt6_info *rt6_select(struct fib6_node *fn, int oif, int strict) | |||
518 | struct rt6_info *match, *rt0; | 507 | struct rt6_info *match, *rt0; |
519 | struct net *net; | 508 | struct net *net; |
520 | 509 | ||
521 | RT6_TRACE("%s(fn->leaf=%p, oif=%d)\n", | ||
522 | __func__, fn->leaf, oif); | ||
523 | |||
524 | rt0 = fn->rr_ptr; | 510 | rt0 = fn->rr_ptr; |
525 | if (!rt0) | 511 | if (!rt0) |
526 | fn->rr_ptr = rt0 = fn->leaf; | 512 | fn->rr_ptr = rt0 = fn->leaf; |
@@ -539,9 +525,6 @@ static struct rt6_info *rt6_select(struct fib6_node *fn, int oif, int strict) | |||
539 | fn->rr_ptr = next; | 525 | fn->rr_ptr = next; |
540 | } | 526 | } |
541 | 527 | ||
542 | RT6_TRACE("%s() => %p\n", | ||
543 | __func__, match); | ||
544 | |||
545 | net = dev_net(rt0->rt6i_dev); | 528 | net = dev_net(rt0->rt6i_dev); |
546 | return match ? match : net->ipv6.ip6_null_entry; | 529 | return match ? match : net->ipv6.ip6_null_entry; |
547 | } | 530 | } |
@@ -2173,10 +2156,9 @@ static int fib6_ifdown(struct rt6_info *rt, void *arg) | |||
2173 | const struct net_device *dev = adn->dev; | 2156 | const struct net_device *dev = adn->dev; |
2174 | 2157 | ||
2175 | if ((rt->rt6i_dev == dev || !dev) && | 2158 | if ((rt->rt6i_dev == dev || !dev) && |
2176 | rt != adn->net->ipv6.ip6_null_entry) { | 2159 | rt != adn->net->ipv6.ip6_null_entry) |
2177 | RT6_TRACE("deleted by ifdown %p\n", rt); | ||
2178 | return -1; | 2160 | return -1; |
2179 | } | 2161 | |
2180 | return 0; | 2162 | return 0; |
2181 | } | 2163 | } |
2182 | 2164 | ||