diff options
Diffstat (limited to 'net/ipv4/xfrm4_tunnel.c')
-rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 1312417608e2..326845195620 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c | |||
@@ -18,7 +18,7 @@ static int ipip_output(struct xfrm_state *x, struct sk_buff *skb) | |||
18 | 18 | ||
19 | static int ipip_xfrm_rcv(struct xfrm_state *x, struct sk_buff *skb) | 19 | static int ipip_xfrm_rcv(struct xfrm_state *x, struct sk_buff *skb) |
20 | { | 20 | { |
21 | return IPPROTO_IP; | 21 | return ip_hdr(skb)->protocol; |
22 | } | 22 | } |
23 | 23 | ||
24 | static int ipip_init_state(struct xfrm_state *x) | 24 | static int ipip_init_state(struct xfrm_state *x) |
@@ -48,20 +48,25 @@ static struct xfrm_type ipip_type = { | |||
48 | .output = ipip_output | 48 | .output = ipip_output |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static int xfrm_tunnel_rcv(struct sk_buff *skb) | ||
52 | { | ||
53 | return xfrm4_rcv_spi(skb, IPPROTO_IP, ip_hdr(skb)->saddr); | ||
54 | } | ||
55 | |||
51 | static int xfrm_tunnel_err(struct sk_buff *skb, u32 info) | 56 | static int xfrm_tunnel_err(struct sk_buff *skb, u32 info) |
52 | { | 57 | { |
53 | return -ENOENT; | 58 | return -ENOENT; |
54 | } | 59 | } |
55 | 60 | ||
56 | static struct xfrm_tunnel xfrm_tunnel_handler = { | 61 | static struct xfrm_tunnel xfrm_tunnel_handler = { |
57 | .handler = xfrm4_rcv, | 62 | .handler = xfrm_tunnel_rcv, |
58 | .err_handler = xfrm_tunnel_err, | 63 | .err_handler = xfrm_tunnel_err, |
59 | .priority = 2, | 64 | .priority = 2, |
60 | }; | 65 | }; |
61 | 66 | ||
62 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 67 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
63 | static struct xfrm_tunnel xfrm64_tunnel_handler = { | 68 | static struct xfrm_tunnel xfrm64_tunnel_handler = { |
64 | .handler = xfrm4_rcv, | 69 | .handler = xfrm_tunnel_rcv, |
65 | .err_handler = xfrm_tunnel_err, | 70 | .err_handler = xfrm_tunnel_err, |
66 | .priority = 2, | 71 | .priority = 2, |
67 | }; | 72 | }; |