Merge nuts.ninka.net:/disk1/davem/BK/netleak-2.5

into nuts.ninka.net:/disk1/davem/BK/net-2.6

diff --cc include/linux/netfilter_bridge.h
index a6531bb097ca88ea554a98ad8d89c3ee6d4d3ceb,966f48f753d160788d642ba8dcc61c8aab98673a..c7e5206ffc8f9437487a54c708879642f7cfc3d4
--- 1/include/linux/netfilter_bridge.h
--- 2/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@@ -71,11 -71,13 +71,11 @@@ static inlin
  void nf_bridge_maybe_copy_header(struct sk_buff *skb)
  {
        if (skb->nf_bridge) {
 -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
                if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-                       memcpy(skb->data - 18, skb->nf_bridge->hh, 18);
+                       memcpy(skb->data - 18, skb->nf_bridge->data, 18);
                        skb_push(skb, 4);
                } else
-                       memcpy(skb->data - 16, skb->nf_bridge->hh, 16);
 -#endif
+                       memcpy(skb->data - 16, skb->nf_bridge->data, 16);
        }
  }
  
@@@ -84,10 -86,11 +84,10 @@@ void nf_bridge_save_header(struct sk_bu
  {
          int header_size = 16;
  
 -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
        if (skb->protocol == __constant_htons(ETH_P_8021Q))
                header_size = 18;
 -#endif
 +
-       memcpy(skb->nf_bridge->hh, skb->data - header_size, header_size);
+       memcpy(skb->nf_bridge->data, skb->data - header_size, header_size);
  }
  
  struct bridge_skb_cb {

diff --cc net/bridge/br_netfilter.c
Simple merge