Hello David,

The next patch adds #ifdef __KERNEL__ for userspace programs, but also adds 
#ifdef CONFIG_NETFILTER to be able to compile the bridge code without 
netfilter (this is because then the skbuff doesn't contain the nf_bridge 
member).
Please apply this instead of the patch I sent on November 10.
If you need an incremental patch against that one of November 10, just yell...
Sorry for the inconvenience and possible waste of time :-(

cheers,
Bart

--- linux-2.5.48/include/linux/netfilter_bridge.h.old   Thu Nov 21 09:46:56 2002
+++ linux-2.5.48/include/linux/netfilter_bridge.h       Thu Nov 21 09:47:14 2002
@@ -6,7 +6,9 @@
 
 #include <linux/config.h>
 #include <linux/netfilter.h>
+#if defined(__KERNEL__) && defined(CONFIG_NETFILTER)
 #include <asm/atomic.h>
+#endif
 
 /* Bridge Hooks */
 /* After promisc drops, checksum checks. */
@@ -23,6 +25,8 @@
 #define NF_BR_BROUTING         5
 #define NF_BR_NUMHOOKS         6
 
+#ifdef __KERNEL__
+
 #define BRNF_PKT_TYPE                  0x01
 #define BRNF_BRIDGED_DNAT              0x02
 #define BRNF_DONT_TAKE_PARENT          0x04
@@ -38,6 +42,7 @@
        NF_BR_PRI_LAST = INT_MAX,
 };
 
+#ifdef CONFIG_NETFILTER
 static inline
 struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
 {
@@ -57,5 +62,7 @@
                __u32 ipv4;
        } daddr;
 };
+#endif /* CONFIG_NETFILTER */
 
+#endif /* __KERNEL__ */
 #endif

_______________________________________________
Bridge mailing list
[EMAIL PROTECTED]
http://www.math.leidenuniv.nl/mailman/listinfo/bridge

Reply via email to