Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932593AbbDZOEM (ORCPT ); Sun, 26 Apr 2015 10:04:12 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40990 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754138AbbDZOEE (ORCPT ); Sun, 26 Apr 2015 10:04: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.14 15/42] benet: Call dev_kfree_skby_any instead of kfree_skb. Date: Sun, 26 Apr 2015 16:01:34 +0200 Message-Id: <20150426134248.802769812@linuxfoundation.org> X-Mailer: git-send-email 2.3.6 In-Reply-To: <20150426134248.160161895@linuxfoundation.org> References: <20150426134248.160161895@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: 1201 Lines: 36 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Eric W. Biederman" Replace free_skb with dev_kfree_skb_any in be_tx_compl_process as which can be called in hard irq by netpoll, softirq context by normal napi polling, and in normal sleepable context by the network device close method. Signed-off-by: "Eric W. Biederman" Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/emulex/benet/be_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -1883,7 +1883,7 @@ static u16 be_tx_compl_process(struct be queue_tail_inc(txq); } while (cur_index != last_index); - kfree_skb(sent_skb); + dev_kfree_skb_any(sent_skb); return num_wrbs; } -- 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/