]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.13-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Sep 2021 12:39:37 +0000 (14:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Sep 2021 12:39:37 +0000 (14:39 +0200)
added patches:
net-ll_temac-remove-left-over-debug-message.patch

queue-5.13/net-ll_temac-remove-left-over-debug-message.patch [new file with mode: 0644]
queue-5.13/series

diff --git a/queue-5.13/net-ll_temac-remove-left-over-debug-message.patch b/queue-5.13/net-ll_temac-remove-left-over-debug-message.patch
new file mode 100644 (file)
index 0000000..1c64075
--- /dev/null
@@ -0,0 +1,31 @@
+From ce03b94ba682a67e8233c9ee3066071656ded58f Mon Sep 17 00:00:00 2001
+From: Esben Haabendal <esben@geanix.com>
+Date: Mon, 21 Jun 2021 10:20:08 +0200
+Subject: net: ll_temac: Remove left-over debug message
+
+From: Esben Haabendal <esben@geanix.com>
+
+commit ce03b94ba682a67e8233c9ee3066071656ded58f upstream.
+
+Fixes: f63963411942 ("net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY")
+Signed-off-by: Esben Haabendal <esben@geanix.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/xilinx/ll_temac_main.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
++++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
+@@ -942,10 +942,8 @@ temac_start_xmit(struct sk_buff *skb, st
+       wmb();
+       lp->dma_out(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */
+-      if (temac_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1)) {
+-              netdev_info(ndev, "%s -> netif_stop_queue\n", __func__);
++      if (temac_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1))
+               netif_stop_queue(ndev);
+-      }
+       return NETDEV_TX_OK;
+ }
index 2a52f5290983b25bf855652e6f4ac5a93bda66fe..52f07de8f476b069b3e8ca5af3c604fa64a74df0 100644 (file)
@@ -1,2 +1,3 @@
 firmware-dmi-move-product_sku-info-to-the-end-of-the-modalias.patch
 igmp-add-ip_mc_list-lock-in-ip_check_mc_rcu.patch
+net-ll_temac-remove-left-over-debug-message.patch