From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52493C33CAF for ; Thu, 16 Jan 2020 18:40:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D2B32073A for ; Thu, 16 Jan 2020 18:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579200048; bh=kRTVsw68jnqHvMwBxkC/iTUe78Oj8a1aOpB3PMFyRdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f8Ca/WIHBGrScP+sXxBGBiUHyzi2Qs1L3j4t4mrcIcopG07o2wza3z1DzTMyW5C0y 94uA425RrSXTx2Flzukb4FEriZkqmMzy/LrSsEIEMwK6b9b2Td9xCWs/bm3qbHf3kc sgnzrvuVj4xY84y+/MbFU31CRy6sXmZ1uydWJuG4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390354AbgAPRL5 (ORCPT ); Thu, 16 Jan 2020 12:11:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:53152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390016AbgAPRLr (ORCPT ); Thu, 16 Jan 2020 12:11:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE65F24692; Thu, 16 Jan 2020 17:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194706; bh=kRTVsw68jnqHvMwBxkC/iTUe78Oj8a1aOpB3PMFyRdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZmdblatR1M9WM/Gq/iVU/EI2uG7kCNTw0pP+ySk8RB2F+g246P1i7C4VJaY7zFrg iEyccrHy09HXQ8l6bDynx1+70VG4yg2kwmlX9NkiV7rcTpovis2h0dKZIJeR/VUXk6 JE2A8vunvlMhGwUrvHf6wFu+K4Vz3Gm4nrHGC1YM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mao Wenan , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 545/671] net: sonic: replace dev_kfree_skb in sonic_send_packet Date: Thu, 16 Jan 2020 12:03:03 -0500 Message-Id: <20200116170509.12787-282-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mao Wenan [ Upstream commit 49f6c90bf6805948b597eabb499e500a47cf24be ] sonic_send_packet will be processed in irq or non-irq context, so it would better use dev_kfree_skb_any instead of dev_kfree_skb. Fixes: d9fb9f384292 ("*sonic/natsemi/ns83829: Move the National Semi-conductor drivers") Signed-off-by: Mao Wenan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/natsemi/sonic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c index be36f7117d48..5f1875fe47cd 100644 --- a/drivers/net/ethernet/natsemi/sonic.c +++ b/drivers/net/ethernet/natsemi/sonic.c @@ -232,7 +232,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr = dma_map_single(lp->device, skb->data, length, DMA_TO_DEVICE); if (!laddr) { pr_err_ratelimited("%s: failed to map tx DMA buffer.\n", dev->name); - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } -- 2.20.1