Commit f773c765 authored Sep 29, 2020 by Sebastian Andrzej Siewior Committed by David S. Miller Sep 29, 2020

net: caif: Use netif_rx_any_context()

The usage of in_interrupt() in non-core code is phased out. Ideally the
information of the calling context should be passed by the callers or the
functions be split as appropriate.

cfhsi_rx_desc() and cfhsi_rx_pld() use in_interrupt() to distinguish if
they should use netif_rx() or netif_rx_ni() for receiving packets.

The attempt to consolidate the code by passing an arguemnt or by
distangling it failed due lack of knowledge about this driver and because
the call chains are hard to follow.

As a stop gap use netif_rx_any_context() which invokes the correct code path
depending on context and confines the in_interrupt() usage to core code.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c11171a4

drivers/net/caif/caif_hsi.c

+2 −17

Original line number	Diff line number	Diff line
		@@ -458,15 +458,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc desc, struct cfhsi cfhsi)
		skb_reset_mac_header(skb);
		skb->dev = cfhsi->ndev;

		/*
		* We are in a callback handler and
		* unfortunately we don't know what context we're
		* running in.
		*/
		if (in_interrupt())
		netif_rx(skb);
		else
		netif_rx_ni(skb);
		netif_rx_any_context(skb);

		/* Update network statistics. */
		cfhsi->ndev->stats.rx_packets++;
		@@ -587,14 +579,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc desc, struct cfhsi cfhsi)
		skb_reset_mac_header(skb);
		skb->dev = cfhsi->ndev;

		/*
		* We're called in callback from HSI
		* and don't know the context we're running in.
		*/
		if (in_interrupt())
		netif_rx(skb);
		else
		netif_rx_ni(skb);
		netif_rx_any_context(skb);

		/* Update network statistics. */
		cfhsi->ndev->stats.rx_packets++;