Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SK_BUFF]: Some more conversions to skb_copy_from_linear_data

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

authored by

Arnaldo Carvalho de Melo and committed by
David S. Miller
1a4e2d09 27d7ff46

+15 -6
+3 -1
net/ax25/ax25_in.c
··· 66 66 67 67 /* Copy data from the fragments */ 68 68 while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) { 69 - memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); 69 + skb_copy_from_linear_data(skbo, 70 + skb_put(skbn, skbo->len), 71 + skbo->len); 70 72 kfree_skb(skbo); 71 73 } 72 74
+1 -1
net/decnet/netfilter/dn_rtmsg.c
··· 48 48 rtm = (struct nf_dn_rtmsg *)NLMSG_DATA(nlh); 49 49 rtm->nfdn_ifindex = rt_skb->dev->ifindex; 50 50 ptr = NFDN_RTMSG(rtm); 51 - memcpy(ptr, rt_skb->data, rt_skb->len); 51 + skb_copy_from_linear_data(rt_skb, ptr, rt_skb->len); 52 52 nlh->nlmsg_len = skb->tail - old_tail; 53 53 return skb; 54 54
+3 -1
net/ipv4/tcp_output.c
··· 1645 1645 /* Ok. We will be able to collapse the packet. */ 1646 1646 tcp_unlink_write_queue(next_skb, sk); 1647 1647 1648 - memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size); 1648 + skb_copy_from_linear_data(next_skb, 1649 + skb_put(skb, next_skb_size), 1650 + next_skb_size); 1649 1651 1650 1652 if (next_skb->ip_summed == CHECKSUM_PARTIAL) 1651 1653 skb->ip_summed = CHECKSUM_PARTIAL;
+3 -1
net/netrom/nr_in.c
··· 54 54 skb_reset_transport_header(skbn); 55 55 56 56 while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) { 57 - memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); 57 + skb_copy_from_linear_data(skbo, 58 + skb_put(skbn, skbo->len), 59 + skbo->len); 58 60 kfree_skb(skbo); 59 61 } 60 62
+5 -2
net/x25/x25_in.c
··· 56 56 skb_reset_transport_header(skbn); 57 57 58 58 skbo = skb_dequeue(&x25->fragment_queue); 59 - memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); 59 + skb_copy_from_linear_data(skbo, skb_put(skbn, skbo->len), 60 + skbo->len); 60 61 kfree_skb(skbo); 61 62 62 63 while ((skbo = 63 64 skb_dequeue(&x25->fragment_queue)) != NULL) { 64 65 skb_pull(skbo, (x25->neighbour->extended) ? 65 66 X25_EXT_MIN_LEN : X25_STD_MIN_LEN); 66 - memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); 67 + skb_copy_from_linear_data(skbo, 68 + skb_put(skbn, skbo->len), 69 + skbo->len); 67 70 kfree_skb(skbo); 68 71 } 69 72