diff options
| author | Kazunori MIYAZAWA <kazunori@miyazawa.org> | 2008-03-24 14:51:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-24 14:51:51 -0700 |
| commit | df9dcb4588aca9cc243cf1f3f454361a84e1cbdb (patch) | |
| tree | 53dabed7cffee752109808cbea2f812e0a6d7faf /net/ipv4 | |
| parent | fa86d322d89995fef1bfb5cc768b89d8c22ea0d9 (diff) | |
| download | linux-3.10-df9dcb4588aca9cc243cf1f3f454361a84e1cbdb.tar.gz linux-3.10-df9dcb4588aca9cc243cf1f3f454361a84e1cbdb.tar.bz2 linux-3.10-df9dcb4588aca9cc243cf1f3f454361a84e1cbdb.zip | |
[IPSEC]: Fix inter address family IPsec tunnel handling.
Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 2 | ||||
| -rw-r--r-- | net/ipv4/xfrm4_output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index 8dee617ee90..584e6d74e3a 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c @@ -41,7 +41,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->ihl = 5; top_iph->version = 4; - top_iph->protocol = x->inner_mode->afinfo->proto; + top_iph->protocol = xfrm_af2proto(skb->dst->ops->family); /* DS disclosed */ top_iph->tos = INET_ECN_encapsulate(XFRM_MODE_SKB_CB(skb)->tos, diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index d5a58a81802..8c3180adddb 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -56,7 +56,7 @@ int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb) { int err; - err = x->inner_mode->afinfo->extract_output(x, skb); + err = xfrm_inner_extract_output(x, skb); if (err) return err; |