diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-12-30 18:19:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-12-30 18:19:13 -0800 |
| commit | f685645bf49cef710761c0d8a58fd0cda6bc1919 (patch) | |
| tree | 7b3108df41fd38f4b4530c52950e4843803ce30d /include/linux | |
| parent | a077e99d64d9d1d7aa046424e4a4388de9bcfc5b (diff) | |
| parent | 6bb00924ba40500eb0aec83c89a09a19570ce395 (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/netleak-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_bridge.h | 6 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index a6531bb097ca..c7e5206ffc8f 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -72,10 +72,10 @@ void nf_bridge_maybe_copy_header(struct sk_buff *skb) { if (skb->nf_bridge) { 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); + memcpy(skb->data - 16, skb->nf_bridge->data, 16); } } @@ -87,7 +87,7 @@ void nf_bridge_save_header(struct sk_buff *skb) if (skb->protocol == __constant_htons(ETH_P_8021Q)) header_size = 18; - 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 --git a/include/linux/skbuff.h b/include/linux/skbuff.h index b7c23dd89b9a..d19e3a2de6a3 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -107,7 +107,7 @@ struct nf_bridge_info { struct net_device *netoutdev; #endif unsigned int mask; - unsigned long hh[32 / sizeof(unsigned long)]; + unsigned long data[32 / sizeof(unsigned long)]; }; #endif |