d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LinuxKPI: iwlwifi: rtw88: rtw89: remove budget argument from netif_napi_add()

Browse Source 
In preparation for future updates remove the budget argument from the
netif_napi_add() in drivers and update LinuxKPI to reflect that it is
gone and only set it internally.  This required changes to the currently
committed wireless drivers based on LinuxKPI (iwlwifi, rtw88, rtw89).

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2022-11-28 15:12:58 +00:00
parent 1b91eba37b
commit 23c73dbae7
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/linuxkpi/common/include/linux/netdevice.h
View File

@ -229,7 +229,7 @@ struct napi_struct {
void linuxkpi_init_dummy_netdev(struct net_device *);
void linuxkpi_netif_napi_add(struct net_device *, struct napi_struct *,
int(*napi_poll)(struct napi_struct *, int), int);
int(*napi_poll)(struct napi_struct *, int));
void linuxkpi_netif_napi_del(struct napi_struct *);
bool linuxkpi_napi_schedule_prep(struct napi_struct *);
void linuxkpi___napi_schedule(struct napi_struct *);
@ -243,8 +243,8 @@ void linuxkpi_napi_synchronize(struct napi_struct *);
#define init_dummy_netdev(_n) \
linuxkpi_init_dummy_netdev(_n)
#define netif_napi_add(_nd, _ns, _p, _b) \
linuxkpi_netif_napi_add(_nd, _ns, _p, _b)
#define netif_napi_add(_nd, _ns, _p) \
linuxkpi_netif_napi_add(_nd, _ns, _p)
#define netif_napi_del(_n) \
linuxkpi_netif_napi_del(_n)
#define napi_schedule_prep(_n) \

4
sys/compat/linuxkpi/common/src/linux_netdev.c
View File

@ -326,12 +326,12 @@ lkpi_napi_task(void *ctx, int pending)
void
linuxkpi_netif_napi_add(struct net_device *ndev, struct napi_struct *napi,
int(*napi_poll)(struct napi_struct *, int), int budget)
int(*napi_poll)(struct napi_struct *, int))
{
napi->dev = ndev;
napi->poll = napi_poll;
napi->budget = budget;
napi->budget = NAPI_POLL_WEIGHT;
INIT_LIST_HEAD(&napi->rx_list);
napi->rx_count = 0;

3
sys/contrib/dev/iwlwifi/pcie/rx.c
View File

@ -1113,8 +1113,7 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)
if (trans_pcie->msix_enabled)
poll = iwl_pcie_napi_poll_msix;
netif_napi_add(&trans_pcie->napi_dev, &rxq->napi,
poll, NAPI_POLL_WEIGHT);
netif_napi_add(&trans_pcie->napi_dev, &rxq->napi, poll);
napi_enable(&rxq->napi);
}

3
sys/contrib/dev/rtw88/pci.c
View File

@ -1801,8 +1801,7 @@ static void rtw_pci_napi_init(struct rtw_dev *rtwdev)
struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;
init_dummy_netdev(&rtwpci->netdev);
netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll,
NAPI_POLL_WEIGHT);
netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll);
}
static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev)

2
sys/contrib/dev/rtw89/core.c
View File

@ -1803,7 +1803,7 @@ void rtw89_core_napi_init(struct rtw89_dev *rtwdev)
{
init_dummy_netdev(&rtwdev->netdev);
netif_napi_add(&rtwdev->netdev, &rtwdev->napi,
rtwdev->hci.ops->napi_poll, NAPI_POLL_WEIGHT);
rtwdev->hci.ops->napi_poll);
}
EXPORT_SYMBOL(rtw89_core_napi_init);