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

Merge branch 'netif_rx-part3' 



Sebastian Andrzej Siewior says:

====================
net: Convert user to netif_rx(), part 3.

This is the third and last 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 micrel phy driver is patched twice within this series: the first is
is to replace netif_rx_ni() and second to move netif_rx() outside of the
IRQ-off section. It is probably simpler to keep it within this series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cd0b6277 67dbd6c0

drivers/net/phy/micrel.c

+3 −3
Original line number Diff line number Diff line
@@ -2034,8 +2034,6 @@ static bool lan8814_match_rx_ts(struct kszphy_ptp_priv *ptp_priv, 
		memset(shhwtstamps, 0, sizeof(*shhwtstamps));

		shhwtstamps->hwtstamp = ktime_set(rx_ts->seconds,

						  rx_ts->nsec);

		netif_rx_ni(skb);



		list_del(&rx_ts->list);

		kfree(rx_ts);
@@ -2044,6 +2042,8 @@ static bool lan8814_match_rx_ts(struct kszphy_ptp_priv *ptp_priv, 
	}

	spin_unlock_irqrestore(&ptp_priv->rx_ts_lock, flags);



	if (ret)

		netif_rx(skb);

	return ret;

}
@@ -2387,7 +2387,7 @@ static bool lan8814_match_skb(struct kszphy_ptp_priv *ptp_priv, 
		shhwtstamps = skb_hwtstamps(skb);

		memset(shhwtstamps, 0, sizeof(*shhwtstamps));

		shhwtstamps->hwtstamp = ktime_set(rx_ts->seconds, rx_ts->nsec);

		netif_rx_ni(skb);

		netif_rx(skb);

	}



	return ret;

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
	} else if (!IS_ENABLED(CONFIG_4KSTACKS)) {

		tun_rx_batched(tun, tfile, skb, more);

	} else {

		netif_rx_ni(skb);

		netif_rx(skb);

	}

	rcu_read_unlock();

drivers/net/vxlan/vxlan_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1877,7 +1877,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni) 
		reply->ip_summed = CHECKSUM_UNNECESSARY;

		reply->pkt_type = PACKET_HOST;



		if (netif_rx_ni(reply) == NET_RX_DROP) {

		if (netif_rx(reply) == NET_RX_DROP) {

			dev->stats.rx_dropped++;

			vxlan_vnifilter_count(vxlan, vni, NULL,

					      VXLAN_VNI_STATS_RX_DROPS, 0);
@@ -2036,7 +2036,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni) 
		if (reply == NULL)

			goto out;



		if (netif_rx_ni(reply) == NET_RX_DROP) {

		if (netif_rx(reply) == NET_RX_DROP) {

			dev->stats.rx_dropped++;

			vxlan_vnifilter_count(vxlan, vni, NULL,

					      VXLAN_VNI_STATS_RX_DROPS, 0);

drivers/s390/net/ctcm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) 
		ch->logflags = 0;

		priv->stats.rx_packets++;

		priv->stats.rx_bytes += skblen;

		netif_rx_ni(skb);

		netif_rx(skb);

		if (len > 0) {

			skb_pull(pskb, header->length);

			if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {

drivers/s390/net/netiucv.c

+1 −5
Original line number Diff line number Diff line
@@ -620,11 +620,7 @@ static void netiucv_unpack_skb(struct iucv_connection *conn, 
		pskb->ip_summed = CHECKSUM_UNNECESSARY;

		privptr->stats.rx_packets++;

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

		/*

		 * Since receiving is always initiated from a tasklet (in iucv.c),

		 * we must use netif_rx_ni() instead of netif_rx()

		 */

		netif_rx_ni(skb);

		netif_rx(skb);

		skb_pull(pskb, header->next);

		skb_put(pskb, NETIUCV_HDRLEN);

	}