Patch "net: systemport: Be drop monitor friendly" has been added to the 4.12-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: systemport: Be drop monitor friendly
to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-systemport-be-drop-monitor-friendly.patch
and it can be found in the queue-4.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Sep 14 23:20:23 PDT 2017
From: Florian Fainelli <[email protected]>
Date: Thu, 24 Aug 2017 15:20:41 -0700
Subject: net: systemport: Be drop monitor friendly
From: Florian Fainelli <[email protected]>
[ Upstream commit c45182eb967af11e9482168be5be41aa22e5d321 ]
Utilize dev_consume_skb_any(cb->skb) in bcm_sysport_free_cb() which is used when a TX packet is completed, as well as when the RX ring is cleaned on shutdown. None of these two cases are packet drops, so be drop monitor friendly.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -593,7 +593,7 @@ static int bcm_sysport_set_coalesce(strustatic void bcm_sysport_free_cb (struct bcm_sysport_cb *cb) { -dev_kfree_skb_any (cb->skb); +dev_consume_skb_any (cb->skb); cb->skb =NULL ;dma_unmap_addr_set (cb, dma_addr,0 ); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.12/net-systemport-be-drop-monitor-friendly.patch queue-4.12/net-bcmgenet-be-drop-monitor-friendly.patch queue-4.12/net-dsa-bcm_sf2-fix-number-of-cfp-entries-for-bcm7278.patch queue-4.12/net-systemport-free-dma-coherent-descriptors-on-errors.patch queue-4.12/fsl-man-inherit-parent-device-and-of_node.patch queue-4.12/revert-net-phy-correctly-process-phy_halted-in-phy_stop_machine.patch