From 448a24130b2585d1397ea9a8b95a8df2332825b9 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Wed, 3 Apr 2019 19:54:12 +0200 Subject: [PATCH] Revert "r8169: use netif_receive_skb_list batching" This reverts commit 6578229d4efb7ea6287861bfc2bd306140458e07. netif_receive_skb_list() doesn't support GRO, therefore we may have scenarios with decreased performance. See discussion here [0]. [0] https://marc.info/?t=155403847400001&r=1&w=2 Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller --- drivers/net/ethernet/realtek/r8169.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c9ee1c8eb635..a8ca26c2ae0c 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6426,7 +6426,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget { unsigned int cur_rx, rx_left; unsigned int count; - LIST_HEAD(rx_list); cur_rx = tp->cur_rx; @@ -6502,7 +6501,7 @@ process_pkt: if (skb->pkt_type == PACKET_MULTICAST) dev->stats.multicast++; - list_add_tail(&skb->list, &rx_list); + napi_gro_receive(&tp->napi, skb); u64_stats_update_begin(&tp->rx_stats.syncp); tp->rx_stats.packets++; @@ -6517,8 +6516,6 @@ release_descriptor: count = cur_rx - tp->cur_rx; tp->cur_rx = cur_rx; - netif_receive_skb_list(&rx_list); - return count; } -- 2.30.2