aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2007-03-31 10:55:19 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:28:29 -0400
commit27d7ff46a3498d3debc6ba68fb8014c702b81170 (patch)
treeb5a0c617cf8339524d3b1f1633e08eae7b94cf86 /net/bridge
parent3dbad80ac7632f243b824d469301abb97ec634a1 (diff)
[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}
To clearly state the intent of copying to linear sk_buffs, _offset being a overly long variant but interesting for the sake of saving some bytes. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netfilter.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 8b45224699f4..fd70d041e51f 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -149,7 +149,8 @@ int nf_bridge_copy_header(struct sk_buff *skb)
149 if (err) 149 if (err)
150 return err; 150 return err;
151 151
152 memcpy(skb->data - header_size, skb->nf_bridge->data, header_size); 152 skb_copy_to_linear_data_offset(skb, -header_size,
153 skb->nf_bridge->data, header_size);
153 154
154 if (skb->protocol == htons(ETH_P_8021Q)) 155 if (skb->protocol == htons(ETH_P_8021Q))
155 __skb_push(skb, VLAN_HLEN); 156 __skb_push(skb, VLAN_HLEN);