diff options
Diffstat (limited to 'net/ipv4/xfrm4_input.c')
-rw-r--r-- | net/ipv4/xfrm4_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c index 8655d038364c..289146bdb8b0 100644 --- a/net/ipv4/xfrm4_input.c +++ b/net/ipv4/xfrm4_input.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Split up af-specific portion | 6 | * Split up af-specific portion |
7 | * Derek Atkins <derek@ihtfp.com> | 7 | * Derek Atkins <derek@ihtfp.com> |
8 | * Add Encapsulation support | 8 | * Add Encapsulation support |
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
@@ -42,7 +42,7 @@ static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb) | |||
42 | 42 | ||
43 | if (skb->dst == NULL) { | 43 | if (skb->dst == NULL) { |
44 | if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, | 44 | if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, |
45 | skb->dev)) | 45 | skb->dev)) |
46 | goto drop; | 46 | goto drop; |
47 | } | 47 | } |
48 | return dst_input(skb); | 48 | return dst_input(skb); |
@@ -149,7 +149,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) | |||
149 | ip_send_check(skb->nh.iph); | 149 | ip_send_check(skb->nh.iph); |
150 | 150 | ||
151 | NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL, | 151 | NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL, |
152 | xfrm4_rcv_encap_finish); | 152 | xfrm4_rcv_encap_finish); |
153 | return 0; | 153 | return 0; |
154 | #else | 154 | #else |
155 | return -skb->nh.iph->protocol; | 155 | return -skb->nh.iph->protocol; |