From: Herbert Xu <[EMAIL PROTECTED]>
Date: Wed, 14 Nov 2007 14:41:54 +0800
> On Tue, Nov 13, 2007 at 10:38:03PM -0800, David Miller wrote:
> >
> > We need to fix something else up first :-)
> >
> > net/ipv4/xfrm4_input.c: In function 'xfrm4_transport_finish':
> > net/ipv4/xfrm4_input.c:65: error: implicit declaration of function
> > 'xfrm4_rcv_encap_finish'
> > net/ipv4/xfrm4_input.c:67: error: 'nexthdr' undeclared (first use in this
> > function)
> > net/ipv4/xfrm4_input.c:67: error: (Each undeclared identifier is reported
> > only once
> > net/ipv4/xfrm4_input.c:67: error: for each function it appears in.)
> > make[2]: *** [net/ipv4/xfrm4_input.o] Error 1
> > make[1]: *** [net/ipv4] Error 2
> > make: *** [net] Error 2
>
> No netfilter, surely not :)
>
> Does this patch help?
>
> [IPSEC]: Fix build problem with netfilter off
>
> The function xfrm4_rcv_encap_finish is now used even with NETFILTER
> off. So we need to remove the ifdefs around i.t
>
> Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
Nope, it needs a little more than that :-) I just checked
in the following:
>From befb75b758f8a4d4de4c535db9f845726eae05eb Mon Sep 17 00:00:00 2001
From: David S. Miller <[EMAIL PROTECTED]>
Date: Tue, 13 Nov 2007 22:45:41 -0800
Subject: [PATCH] [IPV4] xfrm4_input.c: Fix build in non-NETFILTER case.
Based in part on a patch from Herbert Xu.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
net/ipv4/xfrm4_input.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index cd25351..d5890c8 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -21,7 +21,6 @@ int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff
*skb)
return xfrm4_extract_header(skb);
}
-#ifdef CONFIG_NETFILTER
static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb)
{
if (skb->dst == NULL) {
@@ -36,7 +35,6 @@ drop:
kfree_skb(skb);
return NET_RX_DROP;
}
-#endif
int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,
int encap_type)
@@ -64,7 +62,7 @@ int xfrm4_transport_finish(struct sk_buff *skb, int async)
if (async)
return xfrm4_rcv_encap_finish(skb);
- return -nexthdr;
+ return -iph->protocol;
#endif
}
--
1.5.3.5
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
