Commit 8cb19905 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

skbuff: skb_segment: s/frag/nskb_frag/ 



frag points at nskb, so name it appropriately

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d79b3c7

net/core/skbuff.c

+9 −9
Original line number Diff line number Diff line
@@ -2876,7 +2876,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) 


	do {

		struct sk_buff *nskb;

		skb_frag_t *frag;

		skb_frag_t *nskb_frag;

		int hsize;

		int size;
@@ -2969,7 +2969,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) 
			continue;

		}



		frag = skb_shinfo(nskb)->frags;

		nskb_frag = skb_shinfo(nskb)->frags;



		skb_copy_from_linear_data_offset(skb, offset,

						 skb_put(nskb, hsize), hsize);
@@ -2997,13 +2997,13 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) 
				goto err;

			}



			*frag = *skb_frag;

			__skb_frag_ref(frag);

			size = skb_frag_size(frag);

			*nskb_frag = *skb_frag;

			__skb_frag_ref(nskb_frag);

			size = skb_frag_size(nskb_frag);



			if (pos < offset) {

				frag->page_offset += offset - pos;

				skb_frag_size_sub(frag, offset - pos);

				nskb_frag->page_offset += offset - pos;

				skb_frag_size_sub(nskb_frag, offset - pos);

			}



			skb_shinfo(nskb)->nr_frags++;
@@ -3013,11 +3013,11 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) 
				skb_frag++;

				pos += size;

			} else {

				skb_frag_size_sub(frag, pos + size - (offset + len));

				skb_frag_size_sub(nskb_frag, pos + size - (offset + len));

				goto skip_fraglist;

			}



			frag++;

			nskb_frag++;

		}



skip_fraglist: