fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / netfilter_bridge.h

diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index 5250200..55689f3 100644 (file)
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -4,12 +4,9 @@
 /* bridge-specific defines for netfilter. 
  */
 
-#include <linux/config.h>
 #include <linux/netfilter.h>
-#if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER)
-#include <asm/atomic.h>
 #include <linux/if_ether.h>
-#endif
+#include <linux/if_vlan.h>
 
 /* Bridge Hooks */
 /* After promisc drops, checksum checks. */
@@ -47,75 +44,33 @@ enum nf_br_hook_priorities {
 #define BRNF_BRIDGED                   0x08
 #define BRNF_NF_BRIDGE_PREROUTING      0x10
 
-static inline
-struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
-{
-       struct nf_bridge_info **nf_bridge = &(skb->nf_bridge);
-
-       if ((*nf_bridge = kmalloc(sizeof(**nf_bridge), GFP_ATOMIC)) != NULL) {
-               atomic_set(&(*nf_bridge)->use, 1);
-               (*nf_bridge)->mask = 0;
-               (*nf_bridge)->physindev = (*nf_bridge)->physoutdev = NULL;
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-               (*nf_bridge)->netoutdev = NULL;
-#endif
-       }
-
-       return *nf_bridge;
-}
 
 /* Only used in br_forward.c */
+extern int nf_bridge_copy_header(struct sk_buff *skb);
 static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
 {
-       int err;
-
-       if (skb->nf_bridge) {
-               if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-                       err = skb_cow(skb, 18);
-                       if (err)
-                               return err;
-                       memcpy(skb->data - 18, skb->nf_bridge->data, 18);
-                       skb_push(skb, 4);
-               } else {
-                       err = skb_cow(skb, 16);
-                       if (err)
-                               return err;
-                       memcpy(skb->data - 16, skb->nf_bridge->data, 16);
-               }
-       }
-       return 0;
-}
-
-static inline
-void nf_bridge_save_header(struct sk_buff *skb)
-{
-        int header_size = 16;
-
-       if (skb->protocol == __constant_htons(ETH_P_8021Q))
-               header_size = 18;
-
-       memcpy(skb->nf_bridge->data, skb->data - header_size, header_size);
+       if (skb->nf_bridge)
+               return nf_bridge_copy_header(skb);
+       return 0;
 }
 
 /* This is called by the IP fragmenting code and it ensures there is
  * enough room for the encapsulating header (if there is one). */
-static inline
-int nf_bridge_pad(struct sk_buff *skb)
+static inline int nf_bridge_pad(const struct sk_buff *skb)
 {
-       if (skb->protocol == __constant_htons(ETH_P_IP))
-               return 0;
-       if (skb->nf_bridge) {
-               if (skb->protocol == __constant_htons(ETH_P_8021Q))
-                       return 4;
-       }
-       return 0;
+       return (skb->nf_bridge && skb->protocol == htons(ETH_P_8021Q))
+               ? VLAN_HLEN : 0;
 }
 
 struct bridge_skb_cb {
        union {
-               __u32 ipv4;
+               __be32 ipv4;
        } daddr;
 };
+
+#else
+#define nf_bridge_maybe_copy_header(skb)       (0)
+#define nf_bridge_pad(skb)                     (0)
 #endif /* CONFIG_BRIDGE_NETFILTER */
 
 #endif /* __KERNEL__ */