From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58322 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751260AbdIOGVm (ORCPT ); Fri, 15 Sep 2017 02:21:42 -0400 Subject: Patch "net: bcmgenet: Be drop monitor friendly" has been added to the 4.12-stable tree To: f.fainelli@gmail.com, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 14 Sep 2017 23:21:34 -0700 Message-ID: <1505456494780@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled net: bcmgenet: 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-bcmgenet-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 know about it. >>From foo@baz Thu Sep 14 23:20:23 PDT 2017 From: Florian Fainelli Date: Thu, 24 Aug 2017 15:56:29 -0700 Subject: net: bcmgenet: Be drop monitor friendly From: Florian Fainelli [ Upstream commit d4fec855905fa8bd5fb1c59f73ad2d74a944876a ] There are 3 spots where we call dev_kfree_skb() but we are actually just doing a normal SKB consumption: __bcmgenet_tx_reclaim() for normal TX reclamation, bcmgenet_alloc_rx_buffers() during the initial RX ring setup and bcmgenet_free_rx_buffers() during RX ring cleanup. Fixes: d6707bec5986 ("net: bcmgenet: rewrite bcmgenet_rx_refill()") Fixes: f48bed16a756 ("net: bcmgenet: Free skb after last Tx frag") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1203,7 +1203,7 @@ static struct enet_cb *bcmgenet_get_txcb /* Simple helper to free a control block's resources */ static void bcmgenet_free_cb(struct enet_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); } @@ -1868,7 +1868,7 @@ static int bcmgenet_alloc_rx_buffers(str cb = ring->cbs + i; skb = bcmgenet_rx_refill(priv, cb); if (skb) - dev_kfree_skb_any(skb); + dev_consume_skb_any(skb); if (!cb->skb) return -ENOMEM; } Patches currently in stable-queue which might be from f.fainelli@gmail.com 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