diff options
| author | David S. Miller <davem@davemloft.net> | 2022-03-06 11:05:31 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-06 11:05:31 +0000 |
| commit | 83b7b77af37a89a1ef82201ac8fb45456ecc25bb (patch) | |
| tree | c939dc764ea1befe326e43a2832b34e7655e9e1f /drivers/net/phy/dp83640.c | |
| parent | 4c22aac3f83ea3c4c90fa964a88e197f16b8cae0 (diff) | |
| parent | f9834dbdd322f144f7b51f2fe8017fc6b870b3ec (diff) | |
| download | linux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.tar.gz linux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.tar.bz2 linux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/dp83640.c')
| -rw-r--r-- | drivers/net/phy/dp83640.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index c2d1a85ec559..c0a617311e2d 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -886,7 +886,7 @@ out: spin_unlock_irqrestore(&dp83640->rx_lock, flags); if (shhwtstamps) - netif_rx_ni(skb); + netif_rx(skb); } static void decode_txts(struct dp83640_private *dp83640, @@ -1329,7 +1329,7 @@ static void rx_timestamp_work(struct work_struct *work) break; } - netif_rx_ni(skb); + netif_rx(skb); } if (!skb_queue_empty(&dp83640->rx_queue)) @@ -1380,7 +1380,7 @@ static bool dp83640_rxtstamp(struct mii_timestamper *mii_ts, skb_queue_tail(&dp83640->rx_queue, skb); schedule_delayed_work(&dp83640->ts_work, SKB_TIMESTAMP_TIMEOUT); } else { - netif_rx_ni(skb); + netif_rx(skb); } return true; |