r8152: adjust rx_bottom

If a error occurs when submitting rx, skip the remaining submissions
and try to submit them again next time.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index b74a272243ae0783263d95e36d79928b6c091a4c..41a1cbc6cc7f7fd2b8f850193e350ddaac32e72f 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1643,7 +1643,7 @@ static int rx_bottom(struct r8152 *tp, int budget)
 {
        unsigned long flags;
        struct list_head *cursor, *next, rx_queue;
-       int work_done = 0;
+       int ret = 0, work_done = 0;
 
        if (!skb_queue_empty(&tp->rx_queue)) {
                while (work_done < budget) {
@@ -1734,7 +1734,18 @@ find_next_rx:
                }
 
 submit:
-               r8152_submit_rx(tp, agg, GFP_ATOMIC);
+               if (!ret) {
+                       ret = r8152_submit_rx(tp, agg, GFP_ATOMIC);
+               } else {
+                       urb->actual_length = 0;
+                       list_add_tail(&agg->list, next);
+               }
+       }
+
+       if (!list_empty(&rx_queue)) {
+               spin_lock_irqsave(&tp->rx_lock, flags);
+               list_splice_tail(&rx_queue, &tp->rx_done);
+               spin_unlock_irqrestore(&tp->rx_lock, flags);
        }
 
 out1: