Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 159da2905fe..33f8c51968b 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -235,7 +235,7 @@ struct ppp_net {
 /* Prototypes. */
 static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
                         struct file *file, unsigned int cmd, unsigned long arg);
-static void ppp_xmit_process(struct ppp *ppp);
+static int ppp_xmit_process(struct ppp *ppp);
 static void ppp_send_frame(struct ppp *ppp, struct sk_buff *skb);
 static void ppp_push(struct ppp *ppp);
 static void ppp_channel_push(struct channel *pch);
@@ -968,9 +968,9 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
         proto = npindex_to_proto[npi];
         put_unaligned_be16(proto, pp);
 
-        netif_stop_queue(dev);
         skb_queue_tail(&ppp->file.xq, skb);
-        ppp_xmit_process(ppp);
+        if (!ppp_xmit_process(ppp))
+                netif_stop_queue(dev);
         return NETDEV_TX_OK;
 
  outf:
@@ -1048,10 +1048,11 @@ static void ppp_setup(struct net_device *dev)
  * Called to do any work queued up on the transmit side
  * that can now be done.
  */
-static void
+static int
 ppp_xmit_process(struct ppp *ppp)
 {
         struct sk_buff *skb;
+        int ret = 0;
 
         ppp_xmit_lock(ppp);
         if (!ppp->closing) {
@@ -1061,10 +1062,13 @@ ppp_xmit_process(struct ppp *ppp)
                         ppp_send_frame(ppp, skb);
                 /* If there's no work left to do, tell the core net
                    code that we can accept some more. */
-                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq))
+                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) {
                         netif_wake_queue(ppp->dev);
+                        ret = 1;
+                }
         }
         ppp_xmit_unlock(ppp);
+        return ret;
 }
 
 static inline struct sk_buff *