Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a4e2d09 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: Some more conversions to skb_copy_from_linear_data 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
parent 27d7ff46

net/ax25/ax25_in.c

+3 −1
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb) 


					/* Copy data from the fragments */

					while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) {

						memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);

						skb_copy_from_linear_data(skbo,

							  skb_put(skbn, skbo->len),

									  skbo->len);

						kfree_skb(skbo);

					}

net/decnet/netfilter/dn_rtmsg.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct sk_buff *dnrmg_build_message(struct sk_buff *rt_skb, int *errp) 
	rtm = (struct nf_dn_rtmsg *)NLMSG_DATA(nlh);

	rtm->nfdn_ifindex = rt_skb->dev->ifindex;

	ptr = NFDN_RTMSG(rtm);

	memcpy(ptr, rt_skb->data, rt_skb->len);

	skb_copy_from_linear_data(rt_skb, ptr, rt_skb->len);

	nlh->nlmsg_len = skb->tail - old_tail;

	return skb;

net/ipv4/tcp_output.c

+3 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,9 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m 
		/* Ok.	We will be able to collapse the packet. */

		tcp_unlink_write_queue(next_skb, sk);



		memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);

		skb_copy_from_linear_data(next_skb,

					  skb_put(skb, next_skb_size),

					  next_skb_size);



		if (next_skb->ip_summed == CHECKSUM_PARTIAL)

			skb->ip_summed = CHECKSUM_PARTIAL;

net/netrom/nr_in.c

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more) 
		skb_reset_transport_header(skbn);



		while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) {

			memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);

			skb_copy_from_linear_data(skbo,

						  skb_put(skbn, skbo->len),

						  skbo->len);

			kfree_skb(skbo);

		}

net/x25/x25_in.c

+5 −2
Original line number Diff line number Diff line
@@ -56,14 +56,17 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more) 
		skb_reset_transport_header(skbn);



		skbo = skb_dequeue(&x25->fragment_queue);

		memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);

		skb_copy_from_linear_data(skbo, skb_put(skbn, skbo->len),

					  skbo->len);

		kfree_skb(skbo);



		while ((skbo =

			skb_dequeue(&x25->fragment_queue)) != NULL) {

			skb_pull(skbo, (x25->neighbour->extended) ?

					X25_EXT_MIN_LEN : X25_STD_MIN_LEN);

			memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);

			skb_copy_from_linear_data(skbo,

						  skb_put(skbn, skbo->len),

						  skbo->len);

			kfree_skb(skbo);

		}