Skip to content

Commit

Permalink
net: mwifiex: Use netif_rx_any_context().
Browse files Browse the repository at this point in the history
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.

mwifiex uses in_interupt() to select the netif_rx*() variant which matches
the calling context. 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>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sebastian Andrzej Siewior authored and David S. Miller committed Sep 29, 2020
1 parent 75fd296 commit d36981e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
6 changes: 1 addition & 5 deletions drivers/net/wireless/marvell/mwifiex/uap_txrx.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,7 @@ int mwifiex_uap_recv_packet(struct mwifiex_private *priv,
skb->truesize += (skb->len - MWIFIEX_RX_DATA_BUF_SIZE);

/* Forward multicast/broadcast packet to upper layer*/
if (in_interrupt())
netif_rx(skb);
else
netif_rx_ni(skb);

netif_rx_any_context(skb);
return 0;
}

Expand Down
6 changes: 1 addition & 5 deletions drivers/net/wireless/marvell/mwifiex/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,7 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb)
(skb->truesize > MWIFIEX_RX_DATA_BUF_SIZE))
skb->truesize += (skb->len - MWIFIEX_RX_DATA_BUF_SIZE);

if (in_interrupt())
netif_rx(skb);
else
netif_rx_ni(skb);

netif_rx_any_context(skb);
return 0;
}

Expand Down

0 comments on commit d36981e

Please sign in to comment.