Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: Use netif_rx().

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: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: linux-can@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sebastian Andrzej Siewior and committed by
David S. Miller
00f4a0af a3d73e15

+10 -10
+1 -1
drivers/net/can/dev/dev.c
··· 154 154 155 155 cf->can_id |= CAN_ERR_RESTARTED; 156 156 157 - netif_rx_ni(skb); 157 + netif_rx(skb); 158 158 159 159 restart: 160 160 netdev_dbg(dev, "restarted\n");
+1 -1
drivers/net/can/slcan.c
··· 221 221 if (!(cf.can_id & CAN_RTR_FLAG)) 222 222 sl->dev->stats.rx_bytes += cf.len; 223 223 224 - netif_rx_ni(skb); 224 + netif_rx(skb); 225 225 } 226 226 227 227 /* parse tty input stream */
+3 -3
drivers/net/can/spi/hi311x.c
··· 356 356 357 357 can_led_event(priv->net, CAN_LED_EVENT_RX); 358 358 359 - netif_rx_ni(skb); 359 + netif_rx(skb); 360 360 } 361 361 362 362 static void hi3110_hw_sleep(struct spi_device *spi) ··· 677 677 tx_state = txerr >= rxerr ? new_state : 0; 678 678 rx_state = txerr <= rxerr ? new_state : 0; 679 679 can_change_state(net, cf, tx_state, rx_state); 680 - netif_rx_ni(skb); 680 + netif_rx(skb); 681 681 682 682 if (new_state == CAN_STATE_BUS_OFF) { 683 683 can_bus_off(net); ··· 718 718 cf->data[6] = hi3110_read(spi, HI3110_READ_TEC); 719 719 cf->data[7] = hi3110_read(spi, HI3110_READ_REC); 720 720 netdev_dbg(priv->net, "Bus Error\n"); 721 - netif_rx_ni(skb); 721 + netif_rx(skb); 722 722 } 723 723 } 724 724
+2 -2
drivers/net/can/spi/mcp251x.c
··· 740 740 741 741 can_led_event(priv->net, CAN_LED_EVENT_RX); 742 742 743 - netif_rx_ni(skb); 743 + netif_rx(skb); 744 744 } 745 745 746 746 static void mcp251x_hw_sleep(struct spi_device *spi) ··· 987 987 if (skb) { 988 988 frame->can_id |= can_id; 989 989 frame->data[1] = data1; 990 - netif_rx_ni(skb); 990 + netif_rx(skb); 991 991 } else { 992 992 netdev_err(net, "cannot allocate error skb\n"); 993 993 }
+1 -1
drivers/net/can/vcan.c
··· 80 80 skb->dev = dev; 81 81 skb->ip_summed = CHECKSUM_UNNECESSARY; 82 82 83 - netif_rx_ni(skb); 83 + netif_rx(skb); 84 84 } 85 85 86 86 static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
+1 -1
drivers/net/can/vxcan.c
··· 63 63 skb->ip_summed = CHECKSUM_UNNECESSARY; 64 64 65 65 len = cfd->can_id & CAN_RTR_FLAG ? 0 : cfd->len; 66 - if (netif_rx_ni(skb) == NET_RX_SUCCESS) { 66 + if (netif_rx(skb) == NET_RX_SUCCESS) { 67 67 srcstats->tx_packets++; 68 68 srcstats->tx_bytes += len; 69 69 peerstats = &peer->stats;
+1 -1
net/can/af_can.c
··· 284 284 } 285 285 286 286 if (newskb) 287 - netif_rx_ni(newskb); 287 + netif_rx(newskb); 288 288 289 289 /* update statistics */ 290 290 pkg_stats->tx_frames++;