From 23ad125bc54c6cab7f9b9d29bfc6f9e535ee48c4 Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@iki.fi>
Date: Sun, 25 Jan 2009 20:49:14 -0800
Subject: [PATCH] --- yaml --- r: 130193 b: refs/heads/master c:
 a8d694c651356ec89452e15b0189c061fb7e1cf1 h: refs/heads/master i:   130191:
 ec46692888f01cf9dbe66c0d28fc7a12fb7d3b4d v: v3

---
 [refs]                 | 2 +-
 trunk/net/key/af_key.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 64c0c39f9333..003556e49260 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e918085aaff34086e265f825dd469926b1aec4a4
+refs/heads/master: a8d694c651356ec89452e15b0189c061fb7e1cf1
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index f8bd8df5e257..7dcbde3ea7d9 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -1285,6 +1285,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
 				ext_hdrs[SADB_X_EXT_NAT_T_DPORT-1];
 			natt->encap_dport = n_port->sadb_x_nat_t_port_port;
 		}
+		memset(&natt->encap_oa, 0, sizeof(natt->encap_oa));
 	}
 
 	err = xfrm_init_state(x);