Patch "skbuff: skb_segment: s/frag/nskb_frag/" has been added to the 3.13-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    skbuff: skb_segment: s/frag/nskb_frag/

to the 3.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     skbuff-skb_segment-s-frag-nskb_frag.patch
and it can be found in the queue-3.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From foo@baz Thu Apr 10 22:03:04 PDT 2014
From: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
Date: Mon, 10 Mar 2014 18:29:04 +0200
Subject: skbuff: skb_segment: s/frag/nskb_frag/

From: "Michael S. Tsirkin" <mst@xxxxxxxxxx>

[ Upstream commit 8cb19905e9287a93ce7c2cbbdf742a060b00e219 ]

frag points at nskb, so name it appropriately

Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 net/core/skbuff.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2794,7 +2794,7 @@ struct sk_buff *skb_segment(struct sk_bu
 
 	do {
 		struct sk_buff *nskb;
-		skb_frag_t *frag;
+		skb_frag_t *nskb_frag;
 		int hsize;
 		int size;
 
@@ -2887,7 +2887,7 @@ struct sk_buff *skb_segment(struct sk_bu
 			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);
@@ -2915,13 +2915,13 @@ struct sk_buff *skb_segment(struct sk_bu
 				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++;
@@ -2931,11 +2931,11 @@ struct sk_buff *skb_segment(struct sk_bu
 				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:


Patches currently in stable-queue which might be from mst@xxxxxxxxxx are

queue-3.13/virtio-net-correct-error-handling-of-virtqueue_kick.patch
queue-3.13/skbuff-skb_segment-orphan-frags-before-copying.patch
queue-3.13/vhost-fix-total-length-when-packets-are-too-short.patch
queue-3.13/skbuff-skb_segment-s-frag-nskb_frag.patch
queue-3.13/skbuff-skb_segment-s-skb-head_skb.patch
queue-3.13/vhost-validate-vhost_get_vq_desc-return-value.patch
queue-3.13/skbuff-skb_segment-s-skb_frag-frag.patch
queue-3.13/skbuff-skb_segment-s-fskb-list_skb.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]