This is a note to let you know that I've just added the patch titled
skbuff: skb_segment: s/fskb/list_skb/
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-fskb-list_skb.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 19:27:59 +0200
Subject: skbuff: skb_segment: s/fskb/list_skb/
From: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
[ Upstream commit 1a4cedaf65491e66e1e55b8428c89209da729209 ]
fskb is unrelated to frag: it's coming from
frag_list. Rename it list_skb to avoid confusion.
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 | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2768,7 +2768,7 @@ struct sk_buff *skb_segment(struct sk_bu
{
struct sk_buff *segs = NULL;
struct sk_buff *tail = NULL;
- struct sk_buff *fskb = skb_shinfo(head_skb)->frag_list;
+ struct sk_buff *list_skb = skb_shinfo(head_skb)->frag_list;
skb_frag_t *frag = skb_shinfo(head_skb)->frags;
unsigned int mss = skb_shinfo(head_skb)->gso_size;
unsigned int doffset = head_skb->data - skb_mac_header(head_skb);
@@ -2809,14 +2809,14 @@ struct sk_buff *skb_segment(struct sk_bu
if (hsize > len || !sg)
hsize = len;
- if (!hsize && i >= nfrags && skb_headlen(fskb) &&
- (skb_headlen(fskb) == len || sg)) {
- BUG_ON(skb_headlen(fskb) > len);
+ if (!hsize && i >= nfrags && skb_headlen(list_skb) &&
+ (skb_headlen(list_skb) == len || sg)) {
+ BUG_ON(skb_headlen(list_skb) > len);
i = 0;
- nfrags = skb_shinfo(fskb)->nr_frags;
- frag = skb_shinfo(fskb)->frags;
- pos += skb_headlen(fskb);
+ nfrags = skb_shinfo(list_skb)->nr_frags;
+ frag = skb_shinfo(list_skb)->frags;
+ pos += skb_headlen(list_skb);
while (pos < offset + len) {
BUG_ON(i >= nfrags);
@@ -2830,8 +2830,8 @@ struct sk_buff *skb_segment(struct sk_bu
frag++;
}
- nskb = skb_clone(fskb, GFP_ATOMIC);
- fskb = fskb->next;
+ nskb = skb_clone(list_skb, GFP_ATOMIC);
+ list_skb = list_skb->next;
if (unlikely(!nskb))
goto err;
@@ -2898,15 +2898,15 @@ struct sk_buff *skb_segment(struct sk_bu
while (pos < offset + len) {
if (i >= nfrags) {
- BUG_ON(skb_headlen(fskb));
+ BUG_ON(skb_headlen(list_skb));
i = 0;
- nfrags = skb_shinfo(fskb)->nr_frags;
- frag = skb_shinfo(fskb)->frags;
+ nfrags = skb_shinfo(list_skb)->nr_frags;
+ frag = skb_shinfo(list_skb)->frags;
BUG_ON(!nfrags);
- fskb = fskb->next;
+ list_skb = list_skb->next;
}
if (unlikely(skb_shinfo(nskb)->nr_frags >=
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