Skip to contentSkip to conversation

2.6: allow CONFIG_NETFILTER=n and CONFIG_XFRM=y

PATCH In review Olaf Kirch 2 participants 2 messages Apr 27, 2004

Subsystems (3)
lore
Share & tools
lore

Olaf Kirch

author
#0 lore raw

PATCH 1/1 2.6: allow CONFIG_NETFILTER=n and CONFIG_XFRM=y

Hi,

the following patch should fix a compile error when setting CONFIG_NETFILTER=n and CONFIG_XFRM=y.

Cheers,
Olaf

Signature · 3 lines
Olaf Kirch     |  The Hardware Gods hate me.
[email protected]   |
---------------+ 

This patch makes sure the kernel can be compiled with CONFIG_XFRM=y and CONFIG_NETFILTER off.

include/linux/netfilter_ipv4.h renamed from include/linux/netfilter_ipv4.h.dbg +1 -1
@@ -86,7 +86,7 @@
 extern int skb_ip_make_writable(struct sk_buff **pskb,
 				unsigned int writable_len);
 
-#ifdef CONFIG_XFRM
+#if defined(CONFIG_XFRM) && defined(CONFIG_NETFILTER)
 #include <net/route.h>
 #include <net/xfrm.h>
 
#1 lore raw
Quoted 4 lines · Olaf Kirch

Hi,

the following patch should fix a compile error when setting CONFIG_NETFILTER=n and CONFIG_XFRM=y.

This error comes from one of my netfilter+ipsec patches, which are not in mainline yet. I'll add your fix, thanks.

Regards
Patrick

Quoted 21 lines

Cheers,
Olaf

------------------------------------------------------------------------

This patch makes sure the kernel can be compiled with CONFIG_XFRM=y and CONFIG_NETFILTER off.

include/linux/netfilter_ipv4.h renamed from include/linux/netfilter_ipv4.h.dbg +1 -1
@@ -86,7 +86,7 @@
 extern int skb_ip_make_writable(struct sk_buff **pskb,
 				unsigned int writable_len);
 
-#ifdef CONFIG_XFRM
+#if defined(CONFIG_XFRM) && defined(CONFIG_NETFILTER)
 #include <net/route.h>
 #include <net/xfrm.h>