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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 00406C2D0DB for ; Tue, 28 Jan 2020 14:23:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0E6A24681 for ; Tue, 28 Jan 2020 14:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221379; bh=QewKoEJlIRAHjoP4tt654qmdwr7ZKQY39OMFwub97Ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kgGdtBVxjpRn83jo1eUpa/prVQ+BWNgtaGX4E3wEYnW7Ny9tQnfqjOsRpIDVTt1CE Zw5vZLdWIfRkM4xsz/M1qFXq1kV+yAqunTTeaAZcR8TEKsoRxvD+Ad7CNYVo2lkpIc cpjqeGVmpskMDBd0rpSci13AQvnIavsNLS8lxWJg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731887AbgA1OW6 (ORCPT ); Tue, 28 Jan 2020 09:22:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:48914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731794AbgA1OW4 (ORCPT ); Tue, 28 Jan 2020 09:22:56 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2E6AD24681; Tue, 28 Jan 2020 14:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221375; bh=QewKoEJlIRAHjoP4tt654qmdwr7ZKQY39OMFwub97Ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A+3Qs7wV+QYhnrwYSl4b1GrTLTTlx205/Vtuj8W/AyZxJTwYG8XOWgjeS8WYChIUa 3AfVaTgXpu44lqcEdkmPK+Xlpg+mRfZef6ecv2iSyhR5rHEXF4G+FnGAeFdcC9r40d au6YRJe57ru48M8g3qZBKtThllYfpC6lZ2GoXihs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mao Wenan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 200/271] net: sonic: replace dev_kfree_skb in sonic_send_packet Date: Tue, 28 Jan 2020 15:05:49 +0100 Message-Id: <20200128135907.463538012@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 11f472fd5d477..a051dddcbd768 100644 --- a/drivers/net/ethernet/natsemi/sonic.c +++ b/drivers/net/ethernet/natsemi/sonic.c @@ -222,7 +222,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