Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net (1bab8d4c) · Commits · 戴 / test

MAINTAINERS

+7 −1

Original line number	Diff line number	Diff line
		@@ -649,6 +649,12 @@ M: Lino Sanfilippo <LinoSanfilippo@gmx.de>
		S: Maintained
		F: drivers/net/ethernet/alacritech/*

		FORCEDETH GIGABIT ETHERNET DRIVER
		M: Rain River <rain.1986.08.12@gmail.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/ethernet/nvidia/*

		ALCATEL SPEEDTOUCH USB DRIVER
		M: Duncan Sands <duncan.sands@free.fr>
		L: linux-usb@vger.kernel.org
		@@ -17673,7 +17679,7 @@ F: Documentation/ABI/testing/sysfs-hypervisor-xen

		XEN NETWORK BACKEND DRIVER
		M: Wei Liu <wei.liu@kernel.org>
		M: Paul Durrant <paul.durrant@citrix.com>
		M: Paul Durrant <paul@xen.org>
		L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
		L: netdev@vger.kernel.org
		S: Supported

+2 −1

Original line number	Diff line number	Diff line
		@@ -824,7 +824,8 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)
		above_thresh =
		ena_com_sq_have_enough_space(tx_ring->ena_com_io_sq,
		ENA_TX_WAKEUP_THRESH);
		if (netif_tx_queue_stopped(txq) && above_thresh) {
		if (netif_tx_queue_stopped(txq) && above_thresh &&
		test_bit(ENA_FLAG_DEV_UP, &tx_ring->adapter->flags)) {
		netif_tx_wake_queue(txq);
		u64_stats_update_begin(&tx_ring->syncp);
		tx_ring->tx_stats.queue_wakeup++;

+8 −4

Original line number	Diff line number	Diff line
		@@ -4713,10 +4713,12 @@ int stmmac_suspend(struct device *dev)
		if (!ndev \|\| !netif_running(ndev))
		return 0;

		phylink_stop(priv->phylink);

		mutex_lock(&priv->lock);

		rtnl_lock();
		phylink_stop(priv->phylink);
		rtnl_unlock();

		netif_device_detach(ndev);
		stmmac_stop_all_queues(priv);

		@@ -4820,9 +4822,11 @@ int stmmac_resume(struct device *dev)

		stmmac_start_all_queues(priv);

		mutex_unlock(&priv->lock);

		rtnl_lock();
		phylink_start(priv->phylink);
		rtnl_unlock();

		mutex_unlock(&priv->lock);

		return 0;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -906,7 +906,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
		__pskb_pull_tail(skb, pull_to - skb_headlen(skb));
		}
		if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {
		queue->rx.rsp_cons = ++cons;
		queue->rx.rsp_cons = ++cons + skb_queue_len(list);
		kfree_skb(nskb);
		return ~0U;
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -118,6 +118,11 @@ void __qdisc_run(struct Qdisc *q);
		static inline void qdisc_run(struct Qdisc *q)
		{
		if (qdisc_run_begin(q)) {
		/* NOLOCK qdisc must check 'state' under the qdisc seqlock
		* to avoid racing with dev_qdisc_reset()
		*/
		if (!(q->flags & TCQ_F_NOLOCK) \|\|
		likely(!test_bit(__QDISC_STATE_DEACTIVATED, &q->state)))
		__qdisc_run(q);
		qdisc_run_end(q);
		}