[NETFILTER] bridge: code rearrangement for clarity
[linux-2.6.git] / net / bridge / br_netfilter.c
index c06cb09..b498efc 100644 (file)
@@ -61,15 +61,28 @@ static int brnf_filter_vlan_tagged = 1;
 #define brnf_filter_vlan_tagged 1
 #endif
 
-#define IS_VLAN_IP (skb->protocol == __constant_htons(ETH_P_8021Q) &&    \
-       hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_IP) &&  \
-       brnf_filter_vlan_tagged)
-#define IS_VLAN_IPV6 (skb->protocol == __constant_htons(ETH_P_8021Q) &&    \
-       hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_IPV6) &&  \
-       brnf_filter_vlan_tagged)
-#define IS_VLAN_ARP (skb->protocol == __constant_htons(ETH_P_8021Q) &&   \
-       hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_ARP) && \
-       brnf_filter_vlan_tagged)
+int brnf_deferred_hooks;
+EXPORT_SYMBOL_GPL(brnf_deferred_hooks);
+
+static __be16 inline vlan_proto(const struct sk_buff *skb)
+{
+       return vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
+}
+
+#define IS_VLAN_IP(skb) \
+       (skb->protocol == htons(ETH_P_8021Q) && \
+        vlan_proto(skb) == htons(ETH_P_IP) &&  \
+        brnf_filter_vlan_tagged)
+
+#define IS_VLAN_IPV6(skb) \
+       (skb->protocol == htons(ETH_P_8021Q) && \
+        vlan_proto(skb) == htons(ETH_P_IPV6) &&\
+        brnf_filter_vlan_tagged)
+
+#define IS_VLAN_ARP(skb) \
+       (skb->protocol == htons(ETH_P_8021Q) && \
+        vlan_proto(skb) == htons(ETH_P_ARP) && \
+        brnf_filter_vlan_tagged)
 
 /* We need these fake structures to make netfilter happy --
  * lots of places assume that skb->dst != NULL, which isn't
@@ -90,6 +103,7 @@ static struct rtable __fake_rtable = {
                        .dev                    = &__fake_net_device,
                        .path                   = &__fake_rtable.u.dst,
                        .metrics                = {[RTAX_MTU - 1] = 1500},
+                       .flags                  = DST_NOXFRM,
                }
        },
        .rt_flags       = 0,
@@ -102,6 +116,48 @@ static inline struct net_device *bridge_parent(const struct net_device *dev)
        return port ? port->br->dev : NULL;
 }
 
+static inline struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
+{
+       skb->nf_bridge = kzalloc(sizeof(struct nf_bridge_info), GFP_ATOMIC);
+       if (likely(skb->nf_bridge))
+               atomic_set(&(skb->nf_bridge->use), 1);
+
+       return skb->nf_bridge;
+}
+
+static inline void nf_bridge_save_header(struct sk_buff *skb)
+{
+        int header_size = ETH_HLEN;
+
+       if (skb->protocol == htons(ETH_P_8021Q))
+               header_size += VLAN_HLEN;
+
+       memcpy(skb->nf_bridge->data, skb->data - header_size, header_size);
+}
+
+/*
+ * When forwarding bridge frames, we save a copy of the original
+ * header before processing.
+ */
+int nf_bridge_copy_header(struct sk_buff *skb)
+{
+       int err;
+        int header_size = ETH_HLEN;
+
+       if (skb->protocol == htons(ETH_P_8021Q))
+               header_size += VLAN_HLEN;
+
+       err = skb_cow(skb, header_size);
+       if (err)
+               return err;
+
+       memcpy(skb->data - header_size, skb->nf_bridge->data, header_size);
+
+       if (skb->protocol == htons(ETH_P_8021Q))
+               __skb_push(skb, VLAN_HLEN);
+       return 0;
+}
+
 /* PF_BRIDGE/PRE_ROUTING *********************************************/
 /* Undo the changes made for ip6tables PREROUTING and continue the
  * bridge PRE_ROUTING hook. */
@@ -119,7 +175,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
        dst_hold(skb->dst);
 
        skb->dev = nf_bridge->physindev;
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_push(skb, VLAN_HLEN);
                skb->nh.raw -= VLAN_HLEN;
        }
@@ -135,7 +191,7 @@ static void __br_dnat_complain(void)
 
        if (jiffies - last_complaint >= 5 * HZ) {
                printk(KERN_WARNING "Performing cross-bridge DNAT requires IP "
-                       "forwarding to be enabled\n");
+                      "forwarding to be enabled\n");
                last_complaint = jiffies;
        }
 }
@@ -195,7 +251,7 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
        if (!skb->dev)
                kfree_skb(skb);
        else {
-               if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+               if (skb->protocol == htons(ETH_P_8021Q)) {
                        skb_pull(skb, VLAN_HLEN);
                        skb->nh.raw += VLAN_HLEN;
                }
@@ -217,12 +273,17 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
        nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
 
        if (dnat_took_place(skb)) {
-               if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
-                   dev)) {
+               if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev)) {
                        struct rtable *rt;
-                       struct flowi fl = { .nl_u = 
-                       { .ip4_u = { .daddr = iph->daddr, .saddr = 0 ,
-                                    .tos = RT_TOS(iph->tos)} }, .proto = 0};
+                       struct flowi fl = {
+                               .nl_u = {
+                                       .ip4_u = {
+                                                .daddr = iph->daddr,
+                                                .saddr = 0,
+                                                .tos = RT_TOS(iph->tos) },
+                               },
+                               .proto = 0,
+                       };
 
                        if (!ip_route_output_key(&rt, &fl)) {
                                /* - Bridged-and-DNAT'ed traffic doesn't
@@ -246,7 +307,7 @@ bridged_dnat:
                                nf_bridge->mask |= BRNF_BRIDGED_DNAT;
                                skb->dev = nf_bridge->physindev;
                                if (skb->protocol ==
-                                   __constant_htons(ETH_P_8021Q)) {
+                                   htons(ETH_P_8021Q)) {
                                        skb_push(skb, VLAN_HLEN);
                                        skb->nh.raw -= VLAN_HLEN;
                                }
@@ -256,8 +317,7 @@ bridged_dnat:
                                               1);
                                return 0;
                        }
-                       memcpy(eth_hdr(skb)->h_dest, dev->dev_addr,
-                              ETH_ALEN);
+                       memcpy(eth_hdr(skb)->h_dest, dev->dev_addr, ETH_ALEN);
                        skb->pkt_type = PACKET_HOST;
                }
        } else {
@@ -266,7 +326,7 @@ bridged_dnat:
        }
 
        skb->dev = nf_bridge->physindev;
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_push(skb, VLAN_HLEN);
                skb->nh.raw -= VLAN_HLEN;
        }
@@ -296,10 +356,10 @@ static struct net_device *setup_pre_routing(struct sk_buff *skb)
 /* We only check the length. A bridge shouldn't do any hop-by-hop stuff anyway */
 static int check_hbh_len(struct sk_buff *skb)
 {
-       unsigned char *raw = (u8*)(skb->nh.ipv6h+1);
+       unsigned char *raw = (u8 *) (skb->nh.ipv6h + 1);
        u32 pkt_len;
        int off = raw - skb->nh.raw;
-       int len = (raw[1]+1)<<3;
+       int len = (raw[1] + 1) << 3;
 
        if ((raw + len) - skb->data > skb_headlen(skb))
                goto bad;
@@ -308,7 +368,7 @@ static int check_hbh_len(struct sk_buff *skb)
        len -= 2;
 
        while (len > 0) {
-               int optlen = skb->nh.raw[off+1]+2;
+               int optlen = skb->nh.raw[off + 1] + 2;
 
                switch (skb->nh.raw[off]) {
                case IPV6_TLV_PAD0:
@@ -319,16 +379,16 @@ static int check_hbh_len(struct sk_buff *skb)
                        break;
 
                case IPV6_TLV_JUMBO:
-                       if (skb->nh.raw[off+1] != 4 || (off&3) != 2)
+                       if (skb->nh.raw[off + 1] != 4 || (off & 3) != 2)
                                goto bad;
-                       pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2));
+                       pkt_len = ntohl(*(u32 *) (skb->nh.raw + off + 2));
                        if (pkt_len <= IPV6_MAXPLEN ||
                            skb->nh.ipv6h->payload_len)
                                goto bad;
                        if (pkt_len > skb->len - sizeof(struct ipv6hdr))
                                goto bad;
                        if (pskb_trim_rcsum(skb,
-                           pkt_len+sizeof(struct ipv6hdr)))
+                                           pkt_len + sizeof(struct ipv6hdr)))
                                goto bad;
                        break;
                default:
@@ -349,12 +409,13 @@ bad:
 /* Replicate the checks that IPv6 does on packet reception and pass the packet
  * to ip6tables, which doesn't support NAT, so things are fairly simple. */
 static unsigned int br_nf_pre_routing_ipv6(unsigned int hook,
-   struct sk_buff *skb, const struct net_device *in,
-   const struct net_device *out, int (*okfn)(struct sk_buff *))
+                                          struct sk_buff *skb,
+                                          const struct net_device *in,
+                                          const struct net_device *out,
+                                          int (*okfn)(struct sk_buff *))
 {
        struct ipv6hdr *hdr;
        u32 pkt_len;
-       struct nf_bridge_info *nf_bridge;
 
        if (skb->len < sizeof(struct ipv6hdr))
                goto inhdr_error;
@@ -372,18 +433,14 @@ static unsigned int br_nf_pre_routing_ipv6(unsigned int hook,
        if (pkt_len || hdr->nexthdr != NEXTHDR_HOP) {
                if (pkt_len + sizeof(struct ipv6hdr) > skb->len)
                        goto inhdr_error;
-               if (pkt_len + sizeof(struct ipv6hdr) < skb->len) {
-                       if (__pskb_trim(skb, pkt_len + sizeof(struct ipv6hdr)))
-                               goto inhdr_error;
-                       if (skb->ip_summed == CHECKSUM_HW)
-                               skb->ip_summed = CHECKSUM_NONE;
-               }
+               if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr)))
+                       goto inhdr_error;
        }
        if (hdr->nexthdr == NEXTHDR_HOP && check_hbh_len(skb))
-                       goto inhdr_error;
+               goto inhdr_error;
 
-       nf_bridge_put(skb->nf_bridge);
-       if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
+       nf_bridge_put(skb->nf_bridge);
+       if (!nf_bridge_alloc(skb))
                return NF_DROP;
        if (!setup_pre_routing(skb))
                return NF_DROP;
@@ -411,10 +468,8 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
        struct iphdr *iph;
        __u32 len;
        struct sk_buff *skb = *pskb;
-       struct nf_bridge_info *nf_bridge;
-       struct vlan_ethhdr *hdr = vlan_eth_hdr(*pskb);
 
-       if (skb->protocol == __constant_htons(ETH_P_IPV6) || IS_VLAN_IPV6) {
+       if (skb->protocol == htons(ETH_P_IPV6) || IS_VLAN_IPV6(skb)) {
 #ifdef CONFIG_SYSCTL
                if (!brnf_call_ip6tables)
                        return NF_ACCEPT;
@@ -422,10 +477,8 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
                if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
                        goto out;
 
-               if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-                       u8 *vhdr = skb->data;
-                       skb_pull(skb, VLAN_HLEN);
-                       skb_postpull_rcsum(skb, vhdr, VLAN_HLEN);
+               if (skb->protocol == htons(ETH_P_8021Q)) {
+                       skb_pull_rcsum(skb, VLAN_HLEN);
                        skb->nh.raw += VLAN_HLEN;
                }
                return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn);
@@ -435,16 +488,14 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
                return NF_ACCEPT;
 #endif
 
-       if (skb->protocol != __constant_htons(ETH_P_IP) && !IS_VLAN_IP)
+       if (skb->protocol != htons(ETH_P_IP) && !IS_VLAN_IP(skb))
                return NF_ACCEPT;
 
        if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
                goto out;
 
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-               u8 *vhdr = skb->data;
-               skb_pull(skb, VLAN_HLEN);
-               skb_postpull_rcsum(skb, vhdr, VLAN_HLEN);
+       if (skb->protocol == htons(ETH_P_8021Q)) {
+               skb_pull_rcsum(skb, VLAN_HLEN);
                skb->nh.raw += VLAN_HLEN;
        }
 
@@ -455,25 +506,21 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
        if (iph->ihl < 5 || iph->version != 4)
                goto inhdr_error;
 
-       if (!pskb_may_pull(skb, 4*iph->ihl))
+       if (!pskb_may_pull(skb, 4 * iph->ihl))
                goto inhdr_error;
 
        iph = skb->nh.iph;
-       if (ip_fast_csum((__u8 *)iph, iph->ihl) != 0)
+       if (ip_fast_csum((__u8 *) iph, iph->ihl) != 0)
                goto inhdr_error;
 
        len = ntohs(iph->tot_len);
-       if (skb->len < len || len < 4*iph->ihl)
+       if (skb->len < len || len < 4 * iph->ihl)
                goto inhdr_error;
 
-       if (skb->len > len) {
-               __pskb_trim(skb, len);
-               if (skb->ip_summed == CHECKSUM_HW)
-                       skb->ip_summed = CHECKSUM_NONE;
-       }
+       pskb_trim_rcsum(skb, len);
 
-       nf_bridge_put(skb->nf_bridge);
-       if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
+       nf_bridge_put(skb->nf_bridge);
+       if (!nf_bridge_alloc(skb))
                return NF_DROP;
        if (!setup_pre_routing(skb))
                return NF_DROP;
@@ -485,7 +532,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
        return NF_STOLEN;
 
 inhdr_error:
-//     IP_INC_STATS_BH(IpInHdrErrors);
+//      IP_INC_STATS_BH(IpInHdrErrors);
 out:
        return NF_DROP;
 }
@@ -499,8 +546,9 @@ out:
  * register an IPv4 PRE_ROUTING 'sabotage' hook that will
  * prevent this from happening. */
 static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                  const struct net_device *in,
+                                  const struct net_device *out,
+                                  int (*okfn)(struct sk_buff *))
 {
        struct sk_buff *skb = *pskb;
 
@@ -512,15 +560,13 @@ static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb,
        return NF_ACCEPT;
 }
 
-
 /* PF_BRIDGE/FORWARD *************************************************/
 static int br_nf_forward_finish(struct sk_buff *skb)
 {
        struct nf_bridge_info *nf_bridge = skb->nf_bridge;
        struct net_device *in;
-       struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
 
-       if (skb->protocol != __constant_htons(ETH_P_ARP) && !IS_VLAN_ARP) {
+       if (skb->protocol != htons(ETH_P_ARP) && !IS_VLAN_ARP(skb)) {
                in = nf_bridge->physindev;
                if (nf_bridge->mask & BRNF_PKT_TYPE) {
                        skb->pkt_type = PACKET_OTHERHOST;
@@ -529,12 +575,12 @@ static int br_nf_forward_finish(struct sk_buff *skb)
        } else {
                in = *((struct net_device **)(skb->cb));
        }
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_push(skb, VLAN_HLEN);
                skb->nh.raw -= VLAN_HLEN;
        }
        NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, in,
-                       skb->dev, br_forward_finish, 1);
+                      skb->dev, br_forward_finish, 1);
        return 0;
 }
 
@@ -544,12 +590,12 @@ static int br_nf_forward_finish(struct sk_buff *skb)
  * because of the physdev module. For ARP, indev and outdev are the
  * bridge ports. */
 static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                    const struct net_device *in,
+                                    const struct net_device *out,
+                                    int (*okfn)(struct sk_buff *))
 {
        struct sk_buff *skb = *pskb;
        struct nf_bridge_info *nf_bridge;
-       struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
        struct net_device *parent;
        int pf;
 
@@ -560,12 +606,12 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
        if (!parent)
                return NF_DROP;
 
-       if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP)
+       if (skb->protocol == htons(ETH_P_IP) || IS_VLAN_IP(skb))
                pf = PF_INET;
        else
                pf = PF_INET6;
 
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_pull(*pskb, VLAN_HLEN);
                (*pskb)->nh.raw += VLAN_HLEN;
        }
@@ -587,11 +633,11 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
 }
 
 static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                     const struct net_device *in,
+                                     const struct net_device *out,
+                                     int (*okfn)(struct sk_buff *))
 {
        struct sk_buff *skb = *pskb;
-       struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
        struct net_device **d = (struct net_device **)(skb->cb);
 
 #ifdef CONFIG_SYSCTL
@@ -599,15 +645,15 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
                return NF_ACCEPT;
 #endif
 
-       if (skb->protocol != __constant_htons(ETH_P_ARP)) {
-               if (!IS_VLAN_ARP)
+       if (skb->protocol != htons(ETH_P_ARP)) {
+               if (!IS_VLAN_ARP(skb))
                        return NF_ACCEPT;
                skb_pull(*pskb, VLAN_HLEN);
                (*pskb)->nh.raw += VLAN_HLEN;
        }
 
        if (skb->nh.arph->ar_pln != 4) {
-               if (IS_VLAN_ARP) {
+               if (IS_VLAN_ARP(skb)) {
                        skb_push(*pskb, VLAN_HLEN);
                        (*pskb)->nh.raw -= VLAN_HLEN;
                }
@@ -620,17 +666,16 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
        return NF_STOLEN;
 }
 
-
 /* PF_BRIDGE/LOCAL_OUT ***********************************************/
 static int br_nf_local_out_finish(struct sk_buff *skb)
 {
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_push(skb, VLAN_HLEN);
                skb->nh.raw -= VLAN_HLEN;
        }
 
        NF_HOOK_THRESH(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
-                       br_forward_finish, NF_BR_PRI_FIRST + 1);
+                      br_forward_finish, NF_BR_PRI_FIRST + 1);
 
        return 0;
 }
@@ -656,19 +701,19 @@ static int br_nf_local_out_finish(struct sk_buff *skb)
  * even routed packets that didn't arrive on a bridge interface have their
  * nf_bridge->physindev set. */
 static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                   const struct net_device *in,
+                                   const struct net_device *out,
+                                   int (*okfn)(struct sk_buff *))
 {
        struct net_device *realindev, *realoutdev;
        struct sk_buff *skb = *pskb;
        struct nf_bridge_info *nf_bridge;
-       struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
        int pf;
 
        if (!skb->nf_bridge)
                return NF_ACCEPT;
 
-       if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP)
+       if (skb->protocol == htons(ETH_P_IP) || IS_VLAN_IP(skb))
                pf = PF_INET;
        else
                pf = PF_INET6;
@@ -694,7 +739,7 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
                        skb->pkt_type = PACKET_OTHERHOST;
                        nf_bridge->mask ^= BRNF_PKT_TYPE;
                }
-               if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+               if (skb->protocol == htons(ETH_P_8021Q)) {
                        skb_push(skb, VLAN_HLEN);
                        skb->nh.raw -= VLAN_HLEN;
                }
@@ -712,14 +757,14 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
        if (nf_bridge->netoutdev)
                realoutdev = nf_bridge->netoutdev;
 #endif
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_pull(skb, VLAN_HLEN);
                (*pskb)->nh.raw += VLAN_HLEN;
        }
        /* IP forwarded traffic has a physindev, locally
         * generated traffic hasn't. */
        if (realindev != NULL) {
-               if (!(nf_bridge->mask & BRNF_DONT_TAKE_PARENT) ) {
+               if (!(nf_bridge->mask & BRNF_DONT_TAKE_PARENT)) {
                        struct net_device *parent = bridge_parent(realindev);
                        if (parent)
                                realindev = parent;
@@ -738,15 +783,24 @@ out:
        return NF_STOLEN;
 }
 
+static int br_nf_dev_queue_xmit(struct sk_buff *skb)
+{
+       if (skb->protocol == htons(ETH_P_IP) &&
+           skb->len > skb->dev->mtu &&
+           !skb_is_gso(skb))
+               return ip_fragment(skb, br_dev_queue_push_xmit);
+       else
+               return br_dev_queue_push_xmit(skb);
+}
 
 /* PF_BRIDGE/POST_ROUTING ********************************************/
 static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                      const struct net_device *in,
+                                      const struct net_device *out,
+                                      int (*okfn)(struct sk_buff *))
 {
        struct sk_buff *skb = *pskb;
        struct nf_bridge_info *nf_bridge = (*pskb)->nf_bridge;
-       struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
        struct net_device *realoutdev = bridge_parent(skb->dev);
        int pf;
 
@@ -755,7 +809,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
         * keep the check just to be sure... */
        if (skb->mac.raw < skb->head || skb->mac.raw + ETH_HLEN > skb->data) {
                printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: "
-                                "bad mac.raw pointer.");
+                      "bad mac.raw pointer.");
                goto print_error;
        }
 #endif
@@ -766,7 +820,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
        if (!realoutdev)
                return NF_DROP;
 
-       if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP)
+       if (skb->protocol == htons(ETH_P_IP) || IS_VLAN_IP(skb))
                pf = PF_INET;
        else
                pf = PF_INET6;
@@ -785,7 +839,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
                nf_bridge->mask |= BRNF_PKT_TYPE;
        }
 
-       if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+       if (skb->protocol == htons(ETH_P_8021Q)) {
                skb_pull(skb, VLAN_HLEN);
                skb->nh.raw += VLAN_HLEN;
        }
@@ -797,7 +851,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
                realoutdev = nf_bridge->netoutdev;
 #endif
        NF_HOOK(pf, NF_IP_POST_ROUTING, skb, NULL, realoutdev,
-               br_dev_queue_push_xmit);
+               br_nf_dev_queue_xmit);
 
        return NF_STOLEN;
 
@@ -805,22 +859,22 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
 print_error:
        if (skb->dev != NULL) {
                printk("[%s]", skb->dev->name);
-               if (bridge_parent(skb->dev))
-                       printk("[%s]", bridge_parent(skb->dev)->name);
+               if (realoutdev)
+                       printk("[%s]", realoutdev->name);
        }
        printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
-                                             skb->data);
+              skb->data);
        return NF_ACCEPT;
 #endif
 }
 
-
 /* IP/SABOTAGE *****************************************************/
 /* Don't hand locally destined packets to PF_INET(6)/PRE_ROUTING
  * for the second time. */
 static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                  const struct net_device *in,
+                                  const struct net_device *out,
+                                  int (*okfn)(struct sk_buff *))
 {
        if ((*pskb)->nf_bridge &&
            !((*pskb)->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)) {
@@ -834,18 +888,18 @@ static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb,
  * and PF_INET(6)/POST_ROUTING until we have done the forwarding
  * decision in the bridge code and have determined nf_bridge->physoutdev. */
 static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb,
-   const struct net_device *in, const struct net_device *out,
-   int (*okfn)(struct sk_buff *))
+                                   const struct net_device *in,
+                                   const struct net_device *out,
+                                   int (*okfn)(struct sk_buff *))
 {
        struct sk_buff *skb = *pskb;
 
        if ((out->hard_start_xmit == br_dev_xmit &&
-           okfn != br_nf_forward_finish &&
-           okfn != br_nf_local_out_finish &&
-           okfn != br_dev_queue_push_xmit)
+            okfn != br_nf_forward_finish &&
+            okfn != br_nf_local_out_finish && okfn != br_nf_dev_queue_xmit)
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
            || ((out->priv_flags & IFF_802_1Q_VLAN) &&
-           VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit)
+               VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit)
 #endif
            ) {
                struct nf_bridge_info *nf_bridge;
@@ -862,6 +916,8 @@ static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb,
                                return NF_ACCEPT;
                        else if (ip->version == 6 && !brnf_call_ip6tables)
                                return NF_ACCEPT;
+                       else if (!brnf_deferred_hooks)
+                               return NF_ACCEPT;
 #endif
                        if (hook == NF_IP_POST_ROUTING)
                                return NF_ACCEPT;
@@ -970,8 +1026,8 @@ static struct nf_hook_ops br_nf_ops[] = {
 
 #ifdef CONFIG_SYSCTL
 static
-int brnf_sysctl_call_tables(ctl_table *ctl, int write, struct file * filp,
-                       void __user *buffer, size_t *lenp, loff_t *ppos)
+int brnf_sysctl_call_tables(ctl_table * ctl, int write, struct file *filp,
+                           void __user * buffer, size_t * lenp, loff_t * ppos)
 {
        int ret;
 
@@ -1058,7 +1114,8 @@ int br_netfilter_init(void)
 #ifdef CONFIG_SYSCTL
        brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0);
        if (brnf_sysctl_header == NULL) {
-               printk(KERN_WARNING "br_netfilter: can't register to sysctl.\n");
+               printk(KERN_WARNING
+                      "br_netfilter: can't register to sysctl.\n");
                for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++)
                        nf_unregister_hook(&br_nf_ops[i]);
                return -EFAULT;