From 213e39d3131bf8546262619d71b968cf15367bf0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 2 Jul 2012 22:53:37 -0700 Subject: [PATCH] --- yaml --- r: 314979 b: refs/heads/master c: d1e31fb02b31ba88d5650d97c35eb58f52bfe0e1 h: refs/heads/master i: 314977: c917143fc8d4478be5e9d9095310365b6e6c609d 314975: b2284f5919e118ed0c6aff960320b7621e715fca v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_policy.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1851f77a1cb5..aa3d10bc4109 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f187bc6efb7250afee0e2009b6106370319b0c8b +refs/heads/master: d1e31fb02b31ba88d5650d97c35eb58f52bfe0e1 diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c index a28a3f972d5b..6e97855b5842 100644 --- a/trunk/net/xfrm/xfrm_policy.c +++ b/trunk/net/xfrm/xfrm_policy.c @@ -1500,9 +1500,6 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, if (!dev) goto free_dst; - /* Copy neighbour for reachability confirmation */ - dst_set_neighbour(dst0, neigh_clone(dst_get_neighbour_noref(dst))); - xfrm_init_path((struct xfrm_dst *)dst0, dst, nfheader_len); xfrm_init_pmtu(dst_prev);