diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 14:42:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 14:42:54 +0100 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /net/key | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
| download | blackbird-op-linux-0464ac9ebd90cfd5792d3c1158af848281b7eb09.tar.gz blackbird-op-linux-0464ac9ebd90cfd5792d3c1158af848281b7eb09.zip | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'net/key')
| -rw-r--r-- | net/key/af_key.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index f8bd8df5e257..7dcbde3ea7d9 100644 --- a/net/key/af_key.c +++ b/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); |
