aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
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/ipv6
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/ipv6')
-rw-r--r--net/ipv6/ipcomp6.c2
-rw-r--r--net/ipv6/netfilter/ip6_queue.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 7691a1b5caa..1ee50b5782e 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -111,7 +111,7 @@ static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
111 111
112 skb->truesize += dlen - plen; 112 skb->truesize += dlen - plen;
113 __skb_put(skb, dlen - plen); 113 __skb_put(skb, dlen - plen);
114 memcpy(skb->data, scratch, dlen); 114 skb_copy_to_linear_data(skb, scratch, dlen);
115 err = ipch->nexthdr; 115 err = ipch->nexthdr;
116 116
117out_put_cpu: 117out_put_cpu:
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 2f1ae422d87..bfae9fdc466 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -366,7 +366,7 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, struct ipq_queue_entry *e)
366 } 366 }
367 if (!skb_make_writable(&e->skb, v->data_len)) 367 if (!skb_make_writable(&e->skb, v->data_len))
368 return -ENOMEM; 368 return -ENOMEM;
369 memcpy(e->skb->data, v->payload, v->data_len); 369 skb_copy_to_linear_data(e->skb, v->payload, v->data_len);
370 e->skb->ip_summed = CHECKSUM_NONE; 370 e->skb->ip_summed = CHECKSUM_NONE;
371 371
372 return 0; 372 return 0;