---

yaml --- r: 130193 b: refs/heads/master c: a8d694c h: refs/heads/master i: 130191: ec46692 v: v3
git-mirror · Jan 26, 2009 · 23ad125 · 23ad125
1 parent 979857a
commit 23ad125
Show file tree

Hide file tree

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