[PATCH] add necessary #ifdefs to netfilter_bridge.h, vs 2.5.48

diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index b9063ac5a2c5a8822491e23e67534eb136199695..0f07bda8a7cf12eaf555582023ab72394b32dd6d 100644 (file)
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -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 @@ enum nf_br_hook_priorities {
        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 @@ struct bridge_skb_cb {
                __u32 ipv4;
        } daddr;
 };
+#endif /* CONFIG_NETFILTER */
 
+#endif /* __KERNEL__ */
 #endif