1 files changed, 3 insertions, 0 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ea2469398bd5..aa8454901719 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1325,9 +1325,12 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 nskb->next = NULL;
                 rc = dev->hard_start_xmit(nskb, dev);
                 if (unlikely(rc)) {
+                        nskb->next = skb->next;
                         skb->next = nskb;
                         return rc;
                 }
+                if (unlikely(netif_queue_stopped(dev) && skb->next))
+                        return NETDEV_TX_BUSY;
         } while (skb->next);
         
         skb->destructor = DEV_GSO_CB(skb)->destructor;