Commit 83b7b77a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netif_rx-conversions-part2' 



Sebastian Andrzej Siewior says:

====================
net: Convert user to netif_rx(), part 2.

This is the second batch of converting netif_rx_ni() caller to
netif_rx(). The change making this possible is net-next and
netif_rx_ni() is a wrapper around netif_rx(). This is a clean up in
order to remove netif_rx_ni().

The brcmfmac changes are slilghtly larger because the inirq parameter
can be removed.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4c22aac3 f9834dbd

drivers/net/can/dev/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void can_restart(struct net_device *dev) 


	cf->can_id |= CAN_ERR_RESTARTED;



	netif_rx_ni(skb);

	netif_rx(skb);



restart:

	netdev_dbg(dev, "restarted\n");

drivers/net/can/slcan.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static void slc_bump(struct slcan *sl) 
	if (!(cf.can_id & CAN_RTR_FLAG))

		sl->dev->stats.rx_bytes += cf.len;



	netif_rx_ni(skb);

	netif_rx(skb);

}



/* parse tty input stream */

drivers/net/can/spi/hi311x.c

+3 −3
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void hi3110_hw_rx(struct spi_device *spi) 


	can_led_event(priv->net, CAN_LED_EVENT_RX);



	netif_rx_ni(skb);

	netif_rx(skb);

}



static void hi3110_hw_sleep(struct spi_device *spi)
@@ -677,7 +677,7 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) 
			tx_state = txerr >= rxerr ? new_state : 0;

			rx_state = txerr <= rxerr ? new_state : 0;

			can_change_state(net, cf, tx_state, rx_state);

			netif_rx_ni(skb);

			netif_rx(skb);



			if (new_state == CAN_STATE_BUS_OFF) {

				can_bus_off(net);
@@ -718,7 +718,7 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) 
				cf->data[6] = hi3110_read(spi, HI3110_READ_TEC);

				cf->data[7] = hi3110_read(spi, HI3110_READ_REC);

				netdev_dbg(priv->net, "Bus Error\n");

				netif_rx_ni(skb);

				netif_rx(skb);

			}

		}

drivers/net/can/spi/mcp251x.c

+2 −2
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx) 


	can_led_event(priv->net, CAN_LED_EVENT_RX);



	netif_rx_ni(skb);

	netif_rx(skb);

}



static void mcp251x_hw_sleep(struct spi_device *spi)
@@ -987,7 +987,7 @@ static void mcp251x_error_skb(struct net_device *net, int can_id, int data1) 
	if (skb) {

		frame->can_id |= can_id;

		frame->data[1] = data1;

		netif_rx_ni(skb);

		netif_rx(skb);

	} else {

		netdev_err(net, "cannot allocate error skb\n");

	}

drivers/net/can/vcan.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void vcan_rx(struct sk_buff *skb, struct net_device *dev) 
	skb->dev       = dev;

	skb->ip_summed = CHECKSUM_UNNECESSARY;



	netif_rx_ni(skb);

	netif_rx(skb);

}



static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)