From: David S. Miller <davem@davemloft.net>
Date: Thu, 27 Jan 2011 22:59:08 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1397e171f143878dd16ad5f8c99f7b9440cc8911;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6
---

1397e171f143878dd16ad5f8c99f7b9440cc8911
diff --cc net/ipv6/route.c
index 45fafa018f12,28a85fc63cb8..691798c169a5
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -198,9 -193,7 +198,8 @@@ static void ip6_dst_destroy(struct dst_
  		rt->rt6i_idev = NULL;
  		in6_dev_put(idev);
  	}
 +	dst_destroy_metrics_generic(dst);
  	if (peer) {
- 		BUG_ON(!(rt->rt6i_flags & RTF_CACHE));
  		rt->rt6i_peer = NULL;
  		inet_putpeer(peer);
  	}