From 687cd2a7e693f2ef6d6fad10aef358a78131d0be Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 30 Jan 2008 21:48:24 -0800 Subject: [PATCH] --- yaml --- r: 81877 b: refs/heads/master c: b1641064a3f4a58644bc2e8edf40c025c58473b4 h: refs/heads/master i: 81875: a29d022a36a97be80b202438b5f1328dcf7f7f29 v: v3 --- [refs] | 2 +- trunk/net/ipv4/xfrm4_tunnel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fcd93101a165..9dada29dc942 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e242297055f906e8e225fb95a8edbc88e9052634 +refs/heads/master: b1641064a3f4a58644bc2e8edf40c025c58473b4 diff --git a/trunk/net/ipv4/xfrm4_tunnel.c b/trunk/net/ipv4/xfrm4_tunnel.c index 87f77e412ba2..41f5982d2087 100644 --- a/trunk/net/ipv4/xfrm4_tunnel.c +++ b/trunk/net/ipv4/xfrm4_tunnel.c @@ -50,7 +50,7 @@ static const struct xfrm_type ipip_type = { static int xfrm_tunnel_rcv(struct sk_buff *skb) { - return xfrm4_rcv_spi(skb, IPPROTO_IP, ip_hdr(skb)->saddr); + return xfrm4_rcv_spi(skb, IPPROTO_IPIP, ip_hdr(skb)->saddr); } static int xfrm_tunnel_err(struct sk_buff *skb, u32 info)