Skip to content

Commit 9f9919f

Browse files
committed
Merge branch 'netif_rx'
Sebastian Andrzej Siewior says: ==================== net: Convert user to netif_rx(). This is the first 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(). Cc: Andrew Lunn <[email protected]> Cc: [email protected] Cc: Chris Zankel <[email protected]> Cc: Florian Fainelli <[email protected]> Cc: Horatiu Vultur <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Kurt Kanzenbach <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Łukasz Stelmach <[email protected]> Cc: Max Filippov <[email protected]> Cc: Mike Travis <[email protected]> Cc: Nikolay Aleksandrov <[email protected]> Cc: Robin Holt <[email protected]> Cc: Roopa Prabhu <[email protected]> Cc: Steve Wahl <[email protected]> Cc: [email protected] Cc: Vivien Didelot <[email protected]> Cc: Vladimir Oltean <[email protected]> ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 4ee508f + ad0a043 commit 9f9919f

File tree

20 files changed

+23
-23
lines changed

20 files changed

+23
-23
lines changed

Documentation/networking/timestamping.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ timestamping:
668668
(through another RX timestamping FIFO). Deferral on RX is typically
669669
necessary when retrieving the timestamp needs a sleepable context. In
670670
that case, it is the responsibility of the DSA driver to call
671-
``netif_rx_ni()`` on the freshly timestamped skb.
671+
``netif_rx()`` on the freshly timestamped skb.
672672

673673
3.2.2 Ethernet PHYs
674674
^^^^^^^^^^^^^^^^^^^

arch/xtensa/platforms/iss/network.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ static int iss_net_rx(struct net_device *dev)
304304

305305
lp->stats.rx_bytes += skb->len;
306306
lp->stats.rx_packets++;
307-
netif_rx_ni(skb);
307+
netif_rx(skb);
308308
return pkt_len;
309309
}
310310
kfree_skb(skb);

drivers/misc/sgi-xp/xpnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
247247
xpnet_device->stats.rx_packets++;
248248
xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
249249

250-
netif_rx_ni(skb);
250+
netif_rx(skb);
251251
xpc_received(partid, channel, (void *)msg);
252252
}
253253

drivers/net/caif/caif_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,
196196
skb_reset_mac_header(skb);
197197
debugfs_rx(ser, data, count);
198198
/* Push received packet up the stack. */
199-
ret = netif_rx_ni(skb);
199+
ret = netif_rx(skb);
200200
if (!ret) {
201201
ser->dev->stats.rx_packets++;
202202
ser->dev->stats.rx_bytes += count;

drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static void hellcreek_get_rxts(struct hellcreek *hellcreek,
331331
shwt = skb_hwtstamps(skb);
332332
memset(shwt, 0, sizeof(*shwt));
333333
shwt->hwtstamp = ns_to_ktime(ns);
334-
netif_rx_ni(skb);
334+
netif_rx(skb);
335335
}
336336
}
337337

drivers/net/dsa/mv88e6xxx/hwtstamp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,
301301
shwt->hwtstamp = ns_to_ktime(ns);
302302
status &= ~MV88E6XXX_PTP_TS_VALID;
303303
}
304-
netif_rx_ni(skb);
304+
netif_rx(skb);
305305
}
306306
}
307307

drivers/net/dsa/sja1105/sja1105_ptp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static long sja1105_rxtstamp_work(struct ptp_clock_info *ptp)
399399
ts = sja1105_tstamp_reconstruct(ds, ticks, ts);
400400

401401
shwt->hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));
402-
netif_rx_ni(skb);
402+
netif_rx(skb);
403403
}
404404

405405
if (ptp_data->extts_enabled)

drivers/net/ethernet/asix/ax88796c_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ ax88796c_skb_return(struct ax88796c_device *ax_local,
433433
netif_info(ax_local, rx_status, ndev, "< rx, len %zu, type 0x%x\n",
434434
skb->len + sizeof(struct ethhdr), skb->protocol);
435435

436-
status = netif_rx_ni(skb);
436+
status = netif_rx(skb);
437437
if (status != NET_RX_SUCCESS && net_ratelimit())
438438
netif_info(ax_local, rx_err, ndev,
439439
"netif_rx status %d\n", status);

drivers/net/ethernet/davicom/dm9051.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ static int dm9051_loop_rx(struct board_info *db)
804804
skb->protocol = eth_type_trans(skb, db->ndev);
805805
if (db->ndev->features & NETIF_F_RXCSUM)
806806
skb_checksum_none_assert(skb);
807-
netif_rx_ni(skb);
807+
netif_rx(skb);
808808
db->ndev->stats.rx_bytes += rxlen;
809809
db->ndev->stats.rx_packets++;
810810
scanrr++;

drivers/net/ethernet/micrel/ks8851_spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static void ks8851_wrfifo_spi(struct ks8851_net *ks, struct sk_buff *txp,
293293
*/
294294
static void ks8851_rx_skb_spi(struct ks8851_net *ks, struct sk_buff *skb)
295295
{
296-
netif_rx_ni(skb);
296+
netif_rx(skb);
297297
}
298298

299299
/**

0 commit comments

Comments
 (0)