Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753637AbbDZN6x (ORCPT ); Sun, 26 Apr 2015 09:58:53 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40584 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752586AbbDZNsE (ORCPT ); Sun, 26 Apr 2015 09:48:04 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Eric W. Biederman" , "David S. Miller" Subject: [PATCH 3.10 07/31] 8139cp: Call dev_kfree_skby_any instead of kfree_skb. Date: Sun, 26 Apr 2015 15:46:27 +0200 Message-Id: <20150426134209.570565081@linuxfoundation.org> X-Mailer: git-send-email 2.3.6 In-Reply-To: <20150426134209.255099785@linuxfoundation.org> References: <20150426134209.255099785@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1046 Lines: 34 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Eric W. Biederman" Replace kfree_skb with dev_kfree_skb_any in cp_start_xmit as it can be called in both hard irq and other contexts. Signed-off-by: "Eric W. Biederman" Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/8139cp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -899,7 +899,7 @@ out_unlock: return NETDEV_TX_OK; out_dma_error: - kfree_skb(skb); + dev_kfree_skb_any(skb); cp->dev->stats.tx_dropped++; goto out_unlock; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/