---

yaml --- r: 314979 b: refs/heads/master c: d1e31fb h: refs/heads/master i: 314977: c917143 314975: b2284f5 v: v3
git-mirror · Jul 5, 2012 · 213e39d · 213e39d
1 parent eb2cb9b
commit 213e39d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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);