r8169: use napi_consume_skb where possible

Use napi_consume_skb() where possible to profit from
bulk free infrastructure.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 4ed9dabe66fe0de6d29aeb99e77b1bd2a7ff32f9..a7e97e365a2de7d3603a8ff4c52ead1510e251c3 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6204,7 +6204,8 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
        rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }
 
-static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
+static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp,
+                  int budget)
 {
        unsigned int dirty_tx, tx_left, bytes_compl = 0, pkts_compl = 0;
 
@@ -6232,7 +6233,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
                if (status & LastFrag) {
                        pkts_compl++;
                        bytes_compl += tx_skb->skb->len;
-                       dev_consume_skb_any(tx_skb->skb);
+                       napi_consume_skb(tx_skb->skb, budget);
                        tx_skb->skb = NULL;
                }
                dirty_tx++;
@@ -6475,7 +6476,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
 
        work_done = rtl_rx(dev, tp, (u32) budget);
 
-       rtl_tx(dev, tp);
+       rtl_tx(dev, tp, budget);
 
        if (work_done < budget) {
                napi_complete_done(napi, work_done);