git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[IPSEC]: Move IP protocol setting from transforms into xfrm4_input.c
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
xfrm4_tunnel.c
diff --git
a/net/ipv4/xfrm4_tunnel.c
b/net/ipv4/xfrm4_tunnel.c
index
e1fafc1
..
1312417
100644
(file)
--- 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)
static int ipip_xfrm_rcv(struct xfrm_state *x, struct sk_buff *skb)
{
- return
0
;
+ return
IPPROTO_IP
;
}
static int ipip_init_state(struct xfrm_state *x)