From 2bf2ee7be899565b9c3ab75aa8c068e7d339f103 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 1 Jul 2024 19:01:47 +0200 Subject: [PATCH] bmips: enet: restore netif_napi_add weight MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Switch to netif_napi_add_weight and add back weight value from <= v5.15. Fixes: 8f6033e287ea ("bmips: enet: add compatibility with kernel 6.1") Signed-off-by: Álvaro Fernández Rojas --- .../files/drivers/net/ethernet/broadcom/bcm6348-enet.c | 7 +------ .../files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c index 21eb6ea0c2..5e5259a492 100644 --- a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c +++ b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c @@ -25,7 +25,6 @@ #include #include #include -#include /* DMA channels */ #define DMA_CHAN_WIDTH 0x10 @@ -1647,11 +1646,7 @@ static int bcm6348_emac_probe(struct platform_device *pdev) ndev->min_mtu = ETH_ZLEN - ETH_HLEN; ndev->mtu = ETH_DATA_LEN - VLAN_ETH_HLEN; ndev->max_mtu = ENET_MAX_MTU - VLAN_ETH_HLEN; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) - netif_napi_add(ndev, &emac->napi, bcm6348_emac_poll); -#else - netif_napi_add(ndev, &emac->napi, bcm6348_emac_poll, 16); -#endif + netif_napi_add_weight(ndev, &emac->napi, bcm6348_emac_poll, 16); SET_NETDEV_DEV(ndev, dev); ret = devm_register_netdev(dev, ndev); diff --git a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c index b72a788378..7031a74490 100644 --- a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c +++ b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c @@ -20,7 +20,6 @@ #include #include #include -#include /* TODO: Bigger frames may work but we do not trust that they are safe on all * platforms so more research is needed, a max frame size of 2048 has been @@ -1077,11 +1076,7 @@ static int bcm6368_enetsw_probe(struct platform_device *pdev) ndev->min_mtu = ETH_ZLEN; ndev->mtu = ETH_DATA_LEN; ndev->max_mtu = ENETSW_MAX_MTU; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) - netif_napi_add(ndev, &priv->napi, bcm6368_enetsw_poll); -#else - netif_napi_add(ndev, &priv->napi, bcm6368_enetsw_poll, 16); -#endif + netif_napi_add_weight(ndev, &priv->napi, bcm6368_enetsw_poll, 16); ret = devm_register_netdev(dev, ndev); if (ret) { -- 2.30.2