Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bmips: enet: restore netif_napi_add weight

Browse source 
Switch to netif_napi_add_weight and add back weight value from <= v5.15.

Fixes: 8f6033e287 ("bmips: enet: add compatibility with kernel 6.1")
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2024-07-01 19:01:47 +02:00
parent 90b6728de2
commit 2bf2ee7be8
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
View file

@ -25,7 +25,6 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/version.h>
/* DMA channels */ /* DMA channels */
#define DMA_CHAN_WIDTH 0x10 #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->min_mtu = ETH_ZLEN - ETH_HLEN;
ndev->mtu = ETH_DATA_LEN - VLAN_ETH_HLEN; ndev->mtu = ETH_DATA_LEN - VLAN_ETH_HLEN;
ndev->max_mtu = ENET_MAX_MTU - VLAN_ETH_HLEN; ndev->max_mtu = ENET_MAX_MTU - VLAN_ETH_HLEN;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) netif_napi_add_weight(ndev, &emac->napi, bcm6348_emac_poll, 16);
netif_napi_add(ndev, &emac->napi, bcm6348_emac_poll);
#else
netif_napi_add(ndev, &emac->napi, bcm6348_emac_poll, 16);
#endif
SET_NETDEV_DEV(ndev, dev); SET_NETDEV_DEV(ndev, dev);
ret = devm_register_netdev(dev, ndev); ret = devm_register_netdev(dev, ndev);

7
target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
View file

@ -20,7 +20,6 @@
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/version.h>
/* TODO: Bigger frames may work but we do not trust that they are safe on all /* 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 * 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->min_mtu = ETH_ZLEN;
ndev->mtu = ETH_DATA_LEN; ndev->mtu = ETH_DATA_LEN;
ndev->max_mtu = ENETSW_MAX_MTU; ndev->max_mtu = ENETSW_MAX_MTU;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) netif_napi_add_weight(ndev, &priv->napi, bcm6368_enetsw_poll, 16);
netif_napi_add(ndev, &priv->napi, bcm6368_enetsw_poll);
#else
netif_napi_add(ndev, &priv->napi, bcm6368_enetsw_poll, 16);
#endif
ret = devm_register_netdev(dev, ndev); ret = devm_register_netdev(dev, ndev);
if (ret) { if (ret) {