Changeset 18927

Timestamp:

04/05/12 15:30:33 (14 months ago)

Author:

BrainSlayer

Message:

reduce irq load

Location:

src/linux/universal

Files:

• linux-3.2/drivers/net/ppp/ppp_generic.c (modified) (4 diffs)
• linux-3.3/drivers/net/ppp/ppp_generic.c (modified) (4 diffs)

src/linux/universal/linux-3.2/drivers/net/ppp/ppp_generic.c

@@ -236 +236 @@
 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);
@@ -969 +969 @@
         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;
 
@@ -1049 +1049 @@
  * 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);
@@ -1062 +1063 @@
                 /* 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;
 }
 

src/linux/universal/linux-3.3/drivers/net/ppp/ppp_generic.c

@@ -236 +236 @@
 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);
@@ -969 +969 @@
         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;
 
@@ -1049 +1049 @@
  * 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);
@@ -1062 +1063 @@
                 /* 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;
 }