From 893ec5097a3ad740f7165e9e88e91643ef5d0b87 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 5 Jul 2012 23:39:34 +0000
Subject: [PATCH] --- yaml --- r: 315360 b: refs/heads/master c:
 141e369de698f2e17bf716b83fcc647ddcb2220c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_policy.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6077ef5739a3..b515712035c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8104891b86b212de77063660c0c062b427526fa6
+refs/heads/master: 141e369de698f2e17bf716b83fcc647ddcb2220c
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
index 6e97855b5842..65bd1ca51517 100644
--- a/trunk/net/xfrm/xfrm_policy.c
+++ b/trunk/net/xfrm/xfrm_policy.c
@@ -1353,8 +1353,9 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)
 	xdst = dst_alloc(dst_ops, NULL, 0, 0, 0);
 
 	if (likely(xdst)) {
-		memset(&xdst->u.rt6.rt6i_table, 0,
-			sizeof(*xdst) - sizeof(struct dst_entry));
+		struct dst_entry *dst = &xdst->u.dst;
+
+		memset(dst + 1, 0, sizeof(*xdst) - sizeof(*dst));
 		xdst->flo.ops = &xfrm_bundle_fc_ops;
 	} else
 		xdst = ERR_PTR(-ENOBUFS);