diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 1312417608e2..83e9580feac4 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) |
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 3f8a3abde67e..6c67ac197ee0 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -248,7 +248,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
248 | 248 | ||
249 | static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) | 249 | static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) |
250 | { | 250 | { |
251 | return 0; | 251 | return skb_network_header(skb)[IP6CB(skb)->nhoff]; |
252 | } | 252 | } |
253 | 253 | ||
254 | static int xfrm6_tunnel_rcv(struct sk_buff *skb) | 254 | static int xfrm6_tunnel_rcv(struct sk_buff *skb) |