| Message ID | 20220303171505.1604775-7-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 90f77c1c512ffe2e91473658b5eb259b5da04b04 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: Convert user to netif_rx(). | expand |
It was <2022-03-03 czw 18:15>, when Sebastian Andrzej Siewior wrote: > Since commit > baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.") > > the function netif_rx() can be used in preemptible/thread context as > well as in interrupt context. > > Use netif_rx(). > > Cc: Łukasz Stelmach <l.stelmach@samsung.com> > Cc: Horatiu Vultur <horatiu.vultur@microchip.com> > Cc: UNGLinuxDriver@microchip.com > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > --- > drivers/net/ethernet/asix/ax88796c_main.c | 2 +- > drivers/net/ethernet/davicom/dm9051.c | 2 +- > drivers/net/ethernet/micrel/ks8851_spi.c | 2 +- > drivers/net/ethernet/microchip/enc28j60.c | 2 +- > drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 2 +- > drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- > drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- > drivers/net/ethernet/vertexcom/mse102x.c | 2 +- > drivers/net/ethernet/wiznet/w5100.c | 2 +- > 9 files changed, 9 insertions(+), 9 deletions(-) > Acked-by: Łukasz Stelmach <l.stelmach@samsung.com> > diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c > index bf70481bb1cad..6ba5b024a7be7 100644 > --- a/drivers/net/ethernet/asix/ax88796c_main.c > +++ b/drivers/net/ethernet/asix/ax88796c_main.c > @@ -433,7 +433,7 @@ ax88796c_skb_return(struct ax88796c_device *ax_local, > netif_info(ax_local, rx_status, ndev, "< rx, len %zu, type 0x%x\n", > skb->len + sizeof(struct ethhdr), skb->protocol); > > - status = netif_rx_ni(skb); > + status = netif_rx(skb); > if (status != NET_RX_SUCCESS && net_ratelimit()) > netif_info(ax_local, rx_err, ndev, > "netif_rx status %d\n", status); > diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c > index 8ebcb35bbc0e1..a523ddda76093 100644 > --- a/drivers/net/ethernet/davicom/dm9051.c > +++ b/drivers/net/ethernet/davicom/dm9051.c > @@ -804,7 +804,7 @@ static int dm9051_loop_rx(struct board_info *db) > skb->protocol = eth_type_trans(skb, db->ndev); > if (db->ndev->features & NETIF_F_RXCSUM) > skb_checksum_none_assert(skb); > - netif_rx_ni(skb); > + netif_rx(skb); > db->ndev->stats.rx_bytes += rxlen; > db->ndev->stats.rx_packets++; > scanrr++; > diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c > index d167d93e4c12f..82d55fc27edc6 100644 > --- a/drivers/net/ethernet/micrel/ks8851_spi.c > +++ b/drivers/net/ethernet/micrel/ks8851_spi.c > @@ -293,7 +293,7 @@ static void ks8851_wrfifo_spi(struct ks8851_net *ks, struct sk_buff *txp, > */ > static void ks8851_rx_skb_spi(struct ks8851_net *ks, struct sk_buff *skb) > { > - netif_rx_ni(skb); > + netif_rx(skb); > } > > /** > diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c > index db5a3edb4c3c0..559ad94a44d03 100644 > --- a/drivers/net/ethernet/microchip/enc28j60.c > +++ b/drivers/net/ethernet/microchip/enc28j60.c > @@ -975,7 +975,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) > /* update statistics */ > ndev->stats.rx_packets++; > ndev->stats.rx_bytes += len; > - netif_rx_ni(skb); > + netif_rx(skb); > } > } > /* > diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c > index 4e877d9859bff..ad310c95bf5c9 100644 > --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c > +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c > @@ -600,7 +600,7 @@ static irqreturn_t lan966x_xtr_irq_handler(int irq, void *args) > skb->offload_fwd_mark = 0; > } > > - netif_rx_ni(skb); > + netif_rx(skb); > dev->stats.rx_bytes += len; > dev->stats.rx_packets++; > > diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c > index 3c5494afd3c04..c865a4be05eec 100644 > --- a/drivers/net/ethernet/qualcomm/qca_spi.c > +++ b/drivers/net/ethernet/qualcomm/qca_spi.c > @@ -435,7 +435,7 @@ qcaspi_receive(struct qcaspi *qca) > qca->rx_skb->protocol = eth_type_trans( > qca->rx_skb, qca->rx_skb->dev); > skb_checksum_none_assert(qca->rx_skb); > - netif_rx_ni(qca->rx_skb); > + netif_rx(qca->rx_skb); > qca->rx_skb = netdev_alloc_skb_ip_align(net_dev, > net_dev->mtu + VLAN_ETH_HLEN); > if (!qca->rx_skb) { > diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c > index 27c4f43176aaa..26646cb6a20a6 100644 > --- a/drivers/net/ethernet/qualcomm/qca_uart.c > +++ b/drivers/net/ethernet/qualcomm/qca_uart.c > @@ -108,7 +108,7 @@ qca_tty_receive(struct serdev_device *serdev, const unsigned char *data, > qca->rx_skb->protocol = eth_type_trans( > qca->rx_skb, qca->rx_skb->dev); > skb_checksum_none_assert(qca->rx_skb); > - netif_rx_ni(qca->rx_skb); > + netif_rx(qca->rx_skb); > qca->rx_skb = netdev_alloc_skb_ip_align(netdev, > netdev->mtu + > VLAN_ETH_HLEN); > diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c > index 25739b182ac7b..eb39a45de0121 100644 > --- a/drivers/net/ethernet/vertexcom/mse102x.c > +++ b/drivers/net/ethernet/vertexcom/mse102x.c > @@ -362,7 +362,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse) > mse102x_dump_packet(__func__, skb->len, skb->data); > > skb->protocol = eth_type_trans(skb, mse->ndev); > - netif_rx_ni(skb); > + netif_rx(skb); > > mse->ndev->stats.rx_packets++; > mse->ndev->stats.rx_bytes += rxlen; > diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c > index ae24d6b868031..4fd7c39e11233 100644 > --- a/drivers/net/ethernet/wiznet/w5100.c > +++ b/drivers/net/ethernet/wiznet/w5100.c > @@ -883,7 +883,7 @@ static void w5100_rx_work(struct work_struct *work) > struct sk_buff *skb; > > while ((skb = w5100_rx_skb(priv->ndev))) > - netif_rx_ni(skb); > + netif_rx(skb); > > w5100_enable_intr(priv); > }
diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c index bf70481bb1cad..6ba5b024a7be7 100644 --- a/drivers/net/ethernet/asix/ax88796c_main.c +++ b/drivers/net/ethernet/asix/ax88796c_main.c @@ -433,7 +433,7 @@ ax88796c_skb_return(struct ax88796c_device *ax_local, netif_info(ax_local, rx_status, ndev, "< rx, len %zu, type 0x%x\n", skb->len + sizeof(struct ethhdr), skb->protocol); - status = netif_rx_ni(skb); + status = netif_rx(skb); if (status != NET_RX_SUCCESS && net_ratelimit()) netif_info(ax_local, rx_err, ndev, "netif_rx status %d\n", status); diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c index 8ebcb35bbc0e1..a523ddda76093 100644 --- a/drivers/net/ethernet/davicom/dm9051.c +++ b/drivers/net/ethernet/davicom/dm9051.c @@ -804,7 +804,7 @@ static int dm9051_loop_rx(struct board_info *db) skb->protocol = eth_type_trans(skb, db->ndev); if (db->ndev->features & NETIF_F_RXCSUM) skb_checksum_none_assert(skb); - netif_rx_ni(skb); + netif_rx(skb); db->ndev->stats.rx_bytes += rxlen; db->ndev->stats.rx_packets++; scanrr++; diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c index d167d93e4c12f..82d55fc27edc6 100644 --- a/drivers/net/ethernet/micrel/ks8851_spi.c +++ b/drivers/net/ethernet/micrel/ks8851_spi.c @@ -293,7 +293,7 @@ static void ks8851_wrfifo_spi(struct ks8851_net *ks, struct sk_buff *txp, */ static void ks8851_rx_skb_spi(struct ks8851_net *ks, struct sk_buff *skb) { - netif_rx_ni(skb); + netif_rx(skb); } /** diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c index db5a3edb4c3c0..559ad94a44d03 100644 --- a/drivers/net/ethernet/microchip/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c @@ -975,7 +975,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) /* update statistics */ ndev->stats.rx_packets++; ndev->stats.rx_bytes += len; - netif_rx_ni(skb); + netif_rx(skb); } } /* diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index 4e877d9859bff..ad310c95bf5c9 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -600,7 +600,7 @@ static irqreturn_t lan966x_xtr_irq_handler(int irq, void *args) skb->offload_fwd_mark = 0; } - netif_rx_ni(skb); + netif_rx(skb); dev->stats.rx_bytes += len; dev->stats.rx_packets++; diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 3c5494afd3c04..c865a4be05eec 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -435,7 +435,7 @@ qcaspi_receive(struct qcaspi *qca) qca->rx_skb->protocol = eth_type_trans( qca->rx_skb, qca->rx_skb->dev); skb_checksum_none_assert(qca->rx_skb); - netif_rx_ni(qca->rx_skb); + netif_rx(qca->rx_skb); qca->rx_skb = netdev_alloc_skb_ip_align(net_dev, net_dev->mtu + VLAN_ETH_HLEN); if (!qca->rx_skb) { diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c index 27c4f43176aaa..26646cb6a20a6 100644 --- a/drivers/net/ethernet/qualcomm/qca_uart.c +++ b/drivers/net/ethernet/qualcomm/qca_uart.c @@ -108,7 +108,7 @@ qca_tty_receive(struct serdev_device *serdev, const unsigned char *data, qca->rx_skb->protocol = eth_type_trans( qca->rx_skb, qca->rx_skb->dev); skb_checksum_none_assert(qca->rx_skb); - netif_rx_ni(qca->rx_skb); + netif_rx(qca->rx_skb); qca->rx_skb = netdev_alloc_skb_ip_align(netdev, netdev->mtu + VLAN_ETH_HLEN); diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c index 25739b182ac7b..eb39a45de0121 100644 --- a/drivers/net/ethernet/vertexcom/mse102x.c +++ b/drivers/net/ethernet/vertexcom/mse102x.c @@ -362,7 +362,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse) mse102x_dump_packet(__func__, skb->len, skb->data); skb->protocol = eth_type_trans(skb, mse->ndev); - netif_rx_ni(skb); + netif_rx(skb); mse->ndev->stats.rx_packets++; mse->ndev->stats.rx_bytes += rxlen; diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index ae24d6b868031..4fd7c39e11233 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -883,7 +883,7 @@ static void w5100_rx_work(struct work_struct *work) struct sk_buff *skb; while ((skb = w5100_rx_skb(priv->ndev))) - netif_rx_ni(skb); + netif_rx(skb); w5100_enable_intr(priv); }
Since commit baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.") the function netif_rx() can be used in preemptible/thread context as well as in interrupt context. Use netif_rx(). Cc: Łukasz Stelmach <l.stelmach@samsung.com> Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Cc: UNGLinuxDriver@microchip.com Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/net/ethernet/asix/ax88796c_main.c | 2 +- drivers/net/ethernet/davicom/dm9051.c | 2 +- drivers/net/ethernet/micrel/ks8851_spi.c | 2 +- drivers/net/ethernet/microchip/enc28j60.c | 2 +- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 2 +- drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- drivers/net/ethernet/vertexcom/mse102x.c | 2 +- drivers/net/ethernet/wiznet/w5100.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)