| Message ID | 20200123174934.29500-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: bcmgenet: Use netif_tx_napi_add() for TX NAPI | expand |
On 1/23/20 9:49 AM, Florian Fainelli wrote: > Before commit 7587935cfa11 ("net: bcmgenet: move NAPI initialization to > ring initialization") moved the code, this used to be > netif_tx_napi_add(), but we lost that small semantic change in the > process, restore that. > > Fixes: 7587935cfa11 ("net: bcmgenet: move NAPI initialization to ring initialization") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c > index 120fa05a39ff..0a8624be44a9 100644 > --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c > +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c > @@ -2164,8 +2164,8 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, > DMA_END_ADDR); > > /* Initialize Tx NAPI */ > - netif_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll, > - NAPI_POLL_WEIGHT); > + netif_tx_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll, > + NAPI_POLL_WEIGHT); > } > > /* Initialize a RDMA ring */ > Acked-by: Doug Berger <opendmb@gmail.com> Thanks Florian!
From: Florian Fainelli <f.fainelli@gmail.com> Date: Thu, 23 Jan 2020 09:49:34 -0800 > Before commit 7587935cfa11 ("net: bcmgenet: move NAPI initialization to > ring initialization") moved the code, this used to be > netif_tx_napi_add(), but we lost that small semantic change in the > process, restore that. > > Fixes: 7587935cfa11 ("net: bcmgenet: move NAPI initialization to ring initialization") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied, thanks Florian.
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 120fa05a39ff..0a8624be44a9 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2164,8 +2164,8 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, DMA_END_ADDR); /* Initialize Tx NAPI */ - netif_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll, - NAPI_POLL_WEIGHT); + netif_tx_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll, + NAPI_POLL_WEIGHT); } /* Initialize a RDMA ring */
Before commit 7587935cfa11 ("net: bcmgenet: move NAPI initialization to ring initialization") moved the code, this used to be netif_tx_napi_add(), but we lost that small semantic change in the process, restore that. Fixes: 7587935cfa11 ("net: bcmgenet: move NAPI initialization to ring initialization") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)