1 files changed, 15 insertions, 12 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 1a90530f83ff..7d5691cc1f47 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2724,22 +2724,25 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d
 {
         struct sk_buff *next, *head = NULL, *tail;
 
-        while (skb) {
+        for (; skb != NULL; skb = next) {
                 next = skb->next;
                 skb->next = NULL;
+
+                /* in case skb wont be segmented, point to itself */
+                skb->prev = skb;
+
                 skb = validate_xmit_skb(skb, dev);
-                if (skb) {
-                        struct sk_buff *end = skb;
+                if (!skb)
+                        continue;
 
-                        while (end->next)
-                                end = end->next;
-                        if (!head)
-                                head = skb;
-                        else
-                                tail->next = skb;
-                        tail = end;
-                }
-                skb = next;
+                if (!head)
+                        head = skb;
+                else
+                        tail->next = skb;
+                /* If skb was segmented, skb->prev points to
+                 * the last segment. If not, it still contains skb.
+                 */
+                tail = skb->prev;
         }
         return head;
 }