forked from mirror/openwrt
8103b79776
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.114 Removed upstreamed: /target/linux/generic/backport-6.6/540-v6.12-ksmbd-browse-interfaces-list-on-FSCTL_QUERY_INTERFACE_INFO.patch merged upstream with commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.114&id=499089376206f3f7f09d6852b3ec92f2674d24bb All other patches automatically rebased. Build system: bcm4908 Build system: bcm53xx Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com> Link: https://github.com/openwrt/openwrt/pull/20434 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 400909df6e6543cb5cce3db9bbcd413d59125327 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Sat, 10 Feb 2024 17:58:29 +0100
|
|
Subject: [PATCH] r8169: simplify code by using core-provided pcpu stats
|
|
allocation
|
|
|
|
Use core-provided pcpu stats allocation instead of open-coding it in
|
|
the driver.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Link: https://lore.kernel.org/r/03f5bb3b-d7f4-48be-ae8a-54862ec4566c@gmail.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -5298,11 +5298,6 @@ static int rtl_init_one(struct pci_dev *
|
|
raw_spin_lock_init(&tp->mac_ocp_lock);
|
|
mutex_init(&tp->led_lock);
|
|
|
|
- dev->tstats = devm_netdev_alloc_pcpu_stats(&pdev->dev,
|
|
- struct pcpu_sw_netstats);
|
|
- if (!dev->tstats)
|
|
- return -ENOMEM;
|
|
-
|
|
/* Get the *optional* external "ether_clk" used on some boards */
|
|
tp->clk = devm_clk_get_optional_enabled(&pdev->dev, "ether_clk");
|
|
if (IS_ERR(tp->clk))
|
|
@@ -5417,6 +5412,8 @@ static int rtl_init_one(struct pci_dev *
|
|
dev->hw_features |= NETIF_F_RXALL;
|
|
dev->hw_features |= NETIF_F_RXFCS;
|
|
|
|
+ dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
|
|
+
|
|
netdev_sw_irq_coalesce_default_on(dev);
|
|
|
|
/* configure chip for default features */
|