* [PATCH][2.6] fix compilation w/o CONFIG_XFRM
@ 2003-10-18 7:01 Zwane Mwaikambo
2003-10-18 7:02 ` David S. Miller
2003-10-19 2:42 ` Marcelo Abreu
0 siblings, 2 replies; 3+ messages in thread
From: Zwane Mwaikambo @ 2003-10-18 7:01 UTC (permalink / raw)
To: netdev
Index: linux-2.6.0-test8/net/ipv6/sit.c
===================================================================
RCS file: /build/cvsroot/linux-2.6.0-test8/net/ipv6/sit.c,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 sit.c
--- linux-2.6.0-test8/net/ipv6/sit.c 18 Oct 2003 01:37:19 -0000 1.1.1.1
+++ linux-2.6.0-test8/net/ipv6/sit.c 18 Oct 2003 04:13:21 -0000
@@ -377,8 +377,10 @@ static int ipip6_rcv(struct sk_buff *skb
read_lock(&ipip6_lock);
if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) {
+#ifdef CONFIG_XFRM
secpath_put(skb->sp);
skb->sp = NULL;
+#endif
skb->mac.raw = skb->nh.raw;
skb->nh.raw = skb->data;
memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][2.6] fix compilation w/o CONFIG_XFRM
2003-10-18 7:01 [PATCH][2.6] fix compilation w/o CONFIG_XFRM Zwane Mwaikambo
@ 2003-10-18 7:02 ` David S. Miller
2003-10-19 2:42 ` Marcelo Abreu
1 sibling, 0 replies; 3+ messages in thread
From: David S. Miller @ 2003-10-18 7:02 UTC (permalink / raw)
To: Zwane Mwaikambo; +Cc: netdev
Patch applied, thanks Zwane.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][2.6] fix compilation w/o CONFIG_XFRM
2003-10-18 7:01 [PATCH][2.6] fix compilation w/o CONFIG_XFRM Zwane Mwaikambo
2003-10-18 7:02 ` David S. Miller
@ 2003-10-19 2:42 ` Marcelo Abreu
1 sibling, 0 replies; 3+ messages in thread
From: Marcelo Abreu @ 2003-10-19 2:42 UTC (permalink / raw)
To: netdev; +Cc: davem
In case it's not fixed yet...
I'm just reusing the patch from Zwane Mwaikambo for sit.c, now to
fix compilation of ip6_tunnel.c.
Please verify.
--- linux-2.6.0-test8-a/net/ipv6/ip6_tunnel.c 2003-10-18 23:16:42.000000000 -0300
+++ linux-2.6.0-test8-b/net/ipv6/ip6_tunnel.c 2003-10-18 23:17:03.000000000 -0300
@@ -515,8 +515,10 @@
read_unlock(&ip6ip6_lock);
goto discard;
}
+#ifdef CONFIG_XFRM
secpath_put(skb->sp);
skb->sp = NULL;
+#endif
skb->mac.raw = skb->nh.raw;
skb->nh.raw = skb->data;
skb->protocol = htons(ETH_P_IPV6);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-10-19 2:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-10-18 7:01 [PATCH][2.6] fix compilation w/o CONFIG_XFRM Zwane Mwaikambo
2003-10-18 7:02 ` David S. Miller
2003-10-19 2:42 ` Marcelo Abreu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).