diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-27 14:59:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-27 14:59:08 -0800 |
| commit | 1397e171f143878dd16ad5f8c99f7b9440cc8911 (patch) | |
| tree | 8aadcac291a2550028950bcaa5d8d0c0d6bedc45 /net/ipv6 | |
| parent | 144001bddcb4db62c2261f1d703d835851031577 (diff) | |
| parent | 8f2771f2b85aea4d0f9a0137ad3b63d1173c0962 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 45fafa018f1..691798c169a 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -200,7 +200,6 @@ static void ip6_dst_destroy(struct dst_entry *dst) } dst_destroy_metrics_generic(dst); if (peer) { - BUG_ON(!(rt->rt6i_flags & RTF_CACHE)); rt->rt6i_peer = NULL; inet_putpeer(peer); } @@ -210,9 +209,6 @@ void rt6_bind_peer(struct rt6_info *rt, int create) { struct inet_peer *peer; - if (WARN_ON(!(rt->rt6i_flags & RTF_CACHE))) - return; - peer = inet_getpeer_v6(&rt->rt6i_dst.addr, create); if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL) inet_putpeer(peer); |