diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index b971e38..7312707 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -235,7 +235,6 @@ struct xfrm_encap_tmpl { __u16 encap_type; __be16 encap_sport; __be16 encap_dport; - xfrm_address_t encap_oa; }; /* AEVENT flags */ diff --git a/net/key/af_key.c b/net/key/af_key.c index d87c22d..4851deb 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1245,7 +1245,6 @@ 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);