2 files changed, 26 insertions, 6 deletions

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 864fbbc7b24d..191b861e5e53 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -38,13 +38,10 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
         if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))
                 kfree_skb(skb);
         else {
-#ifdef CONFIG_BRIDGE_NETFILTER
                 /* ip_refrag calls ip_fragment, doesn't copy the MAC header. */
                 if (nf_bridge_maybe_copy_header(skb))
                         kfree_skb(skb);
-                else
-#endif
-                {
+                else {
                         skb_push(skb, ETH_HLEN);
 
                         dev_queue_xmit(skb);
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 05b3de888243..b498efcfe451 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -127,14 +127,37 @@ static inline struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
 
 static inline void nf_bridge_save_header(struct sk_buff *skb)
 {
-        int header_size = 16;
+        int header_size = ETH_HLEN;
 
         if (skb->protocol == htons(ETH_P_8021Q))
-                header_size = 18;
+                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. */