Commit 9f9919f7 authored by David S. Miller's avatar David S. Miller
Browse files

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 <andrew@lunn.ch>
Cc: bridge@lists.linux-foundation.org
Cc: Chris Zankel <chris@zankel.net>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kurt Kanzenbach <kurt@linutronix.de>
Cc: linux-doc@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: Łukasz Stelmach <l.stelmach@samsung.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mike Travis <mike.travis@hpe.com>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Roopa Prabhu <roopa@nvidia.com>
Cc: Steve Wahl <steve.wahl@hpe.com>
Cc: UNGLinuxDriver@microchip.com
Cc: Vivien Didelot <vivien.didelot@gmail.com>
Cc: Vladimir Oltean <olteanv@gmail.com>
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4ee508ff ad0a043f

Documentation/networking/timestamping.rst

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ timestamping: 
  (through another RX timestamping FIFO). Deferral on RX is typically

  necessary when retrieving the timestamp needs a sleepable context. In

  that case, it is the responsibility of the DSA driver to call

  ``netif_rx_ni()`` on the freshly timestamped skb.

  ``netif_rx()`` on the freshly timestamped skb.



3.2.2 Ethernet PHYs

^^^^^^^^^^^^^^^^^^^

arch/xtensa/platforms/iss/network.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int iss_net_rx(struct net_device *dev) 


		lp->stats.rx_bytes += skb->len;

		lp->stats.rx_packets++;

		netif_rx_ni(skb);

		netif_rx(skb);

		return pkt_len;

	}

	kfree_skb(skb);

drivers/misc/sgi-xp/xpnet.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg) 
	xpnet_device->stats.rx_packets++;

	xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;



	netif_rx_ni(skb);

	netif_rx(skb);

	xpc_received(partid, channel, (void *)msg);

}

drivers/net/caif/caif_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data, 
	skb_reset_mac_header(skb);

	debugfs_rx(ser, data, count);

	/* Push received packet up the stack. */

	ret = netif_rx_ni(skb);

	ret = netif_rx(skb);

	if (!ret) {

		ser->dev->stats.rx_packets++;

		ser->dev->stats.rx_bytes += count;

drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}