OSDN Git Service

net: phy: Use netif_rx().
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Sat, 5 Mar 2022 22:12:45 +0000 (23:12 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Mar 2022 11:05:31 +0000 (11:05 +0000)
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: Andrew Lunn <andrew@lunn.ch>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/dp83640.c
drivers/net/phy/mscc/mscc_ptp.c
drivers/net/phy/nxp-c45-tja11xx.c

index c2d1a85..c0a6173 100644 (file)
@@ -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;
index 34f8298..cf728bf 100644 (file)
@@ -1212,7 +1212,7 @@ static bool vsc85xx_rxtstamp(struct mii_timestamper *mii_ts,
                ts.tv_sec--;
 
        shhwtstamps->hwtstamp = ktime_set(ts.tv_sec, ns);
-       netif_rx_ni(skb);
+       netif_rx(skb);
 
        return true;
 }
index 06fdbae..047c581 100644 (file)
@@ -478,7 +478,7 @@ static long nxp_c45_do_aux_work(struct ptp_clock_info *ptp)
                shhwtstamps_rx = skb_hwtstamps(skb);
                shhwtstamps_rx->hwtstamp = ns_to_ktime(timespec64_to_ns(&ts));
                NXP_C45_SKB_CB(skb)->header->reserved2 = 0;
-               netif_rx_ni(skb);
+               netif_rx(skb);
        }
 
        if (priv->extts) {