projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IPSEC]: Changing API of xfrm4_tunnel_register.
[powerpc.git]
/
net
/
ipv4
/
xfrm4_input.c
diff --git
a/net/ipv4/xfrm4_input.c
b/net/ipv4/xfrm4_input.c
index
817ed84
..
78e80de
100644
(file)
--- a/
net/ipv4/xfrm4_input.c
+++ b/
net/ipv4/xfrm4_input.c
@@
-6,7
+6,7
@@
* Split up af-specific portion
* Derek Atkins <derek@ihtfp.com>
* Add Encapsulation support
* Split up af-specific portion
* Derek Atkins <derek@ihtfp.com>
* Add Encapsulation support
- *
+ *
*/
#include <linux/module.h>
*/
#include <linux/module.h>
@@
-23,10
+23,11
@@
int xfrm4_rcv(struct sk_buff *skb)
EXPORT_SYMBOL(xfrm4_rcv);
EXPORT_SYMBOL(xfrm4_rcv);
-static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr,
u32 *spi, u
32 *seq)
+static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr,
__be32 *spi, __be
32 *seq)
{
switch (nexthdr) {
case IPPROTO_IPIP:
{
switch (nexthdr) {
case IPPROTO_IPIP:
+ case IPPROTO_IPV6:
*spi = skb->nh.iph->saddr;
*seq = 0;
return 0;
*spi = skb->nh.iph->saddr;
*seq = 0;
return 0;
@@
-42,7
+43,7
@@
static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb)
if (skb->dst == NULL) {
if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
if (skb->dst == NULL) {
if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
- skb->dev))
+ skb->dev))
goto drop;
}
return dst_input(skb);
goto drop;
}
return dst_input(skb);
@@
-55,7
+56,7
@@
drop:
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
{
int err;
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
{
int err;
-
u
32 spi, seq;
+
__be
32 spi, seq;
struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
struct xfrm_state *x;
int xfrm_nr = 0;
struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
struct xfrm_state *x;
int xfrm_nr = 0;
@@
-70,7
+71,8
@@
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
if (xfrm_nr == XFRM_MAX_DEPTH)
goto drop;
if (xfrm_nr == XFRM_MAX_DEPTH)
goto drop;
- x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, iph->protocol, AF_INET);
+ x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi,
+ iph->protocol != IPPROTO_IPV6 ? iph->protocol : IPPROTO_IPIP, AF_INET);
if (x == NULL)
goto drop;
if (x == NULL)
goto drop;
@@
-106,7
+108,7
@@
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
if (x->mode->input(x, skb))
goto drop;
if (x->mode->input(x, skb))
goto drop;
- if (x->props.mode) {
+ if (x->props.mode
== XFRM_MODE_TUNNEL
) {
decaps = 1;
break;
}
decaps = 1;
break;
}
@@
-149,7
+151,7
@@
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
ip_send_check(skb->nh.iph);
NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL,
ip_send_check(skb->nh.iph);
NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL,
- xfrm4_rcv_encap_finish);
+ xfrm4_rcv_encap_finish);
return 0;
#else
return -skb->nh.iph->protocol;
return 0;
#else
return -skb->nh.iph->protocol;