net: dsa: Use netif_rx().

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: Kurt Kanzenbach <kurt@linutronix.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Vivien Didelot <vivien.didelot@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Kurt Kanzenbach <kurt@linutronix.de> # hellcreek
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c b/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
index b3bc948d6145bdd149c6f6f386d29464cde405d1..ffd06cf8c44f0bc588e822ff61b52c17b8e9240a 100644 (file)
--- a/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
+++ b/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
@@ -331,7 +331,7 @@ static void hellcreek_get_rxts(struct hellcreek *hellcreek,
                shwt = skb_hwtstamps(skb);
                memset(shwt, 0, sizeof(*shwt));
                shwt->hwtstamp = ns_to_ktime(ns);
-               netif_rx_ni(skb);
+               netif_rx(skb);
        }
 }
 

diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c
index 389f8a6ec0ab30194e3596f26e77ff68637d25ed..331b4ca089ffa63805c2cbe434a5ad28777fd9be 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/hwtstamp.c
+++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.c
@@ -301,7 +301,7 @@ static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,
                        shwt->hwtstamp = ns_to_ktime(ns);
                        status &= ~MV88E6XXX_PTP_TS_VALID;
                }
-               netif_rx_ni(skb);
+               netif_rx(skb);
        }
 }
 

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index be3068a935af5f287e0a0fe01f7751d204f177e0..30fb2cc40164b120c2bdf47608837136b084cd47 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -399,7 +399,7 @@ static long sja1105_rxtstamp_work(struct ptp_clock_info *ptp)
                ts = sja1105_tstamp_reconstruct(ds, ticks, ts);
 
                shwt->hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));
-               netif_rx_ni(skb);
+               netif_rx(skb);
        }
 
        if (ptp_data->extts_enabled)