Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp1234238imj; Thu, 14 Feb 2019 03:24:20 -0800 (PST) X-Google-Smtp-Source: AHgI3IY4Yn2/w0GwwNfEeLOiwBc4CMlYiLJq8NclRZv/83ZXm6GMCtPZ96/gl7m67kyGM61pX0/A X-Received: by 2002:aa7:808a:: with SMTP id v10mr3575247pff.8.1550143460844; Thu, 14 Feb 2019 03:24:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550143460; cv=none; d=google.com; s=arc-20160816; b=iWs1ovOis4c8umXVKoI2Z1nHuLxljykNt9Wju9OQsAaXYRrJ1dTZ9gei+CU389EJ9k 8wlTQaZ37Ku3OKC+GrvIJ+OfJZOVTkhMPqCA+TrsUt3gdlhB4oz3SblzSb6gTNgYk4pJ 6H6odbTxiwJaYNY2znFsDYhED+U1X614gbwc9KUv45niwxtYwfD3EGHp1dVmaxp5IXuK 6+9n7naH0rIAGpd8qNq2qI8YDaFez+nfq/7Vq7G0ozerjgxhCHVPJjwyjsWJyRFr0Tr0 N7ehqSYPri0T5Af8QpbUxpBCBGwnj0SBAjf084ifRONwGXLQ1XveKt7diMOQAC6WGrJh 0VfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=7NyLjILuRxj9W+AUso0W3Felj2atbaxEUaKWJTvzr08=; b=VJ0x7eUEzmm/jdOZgcZOLO/9U5WTDL+9Cd4tg9kMEFsMe1HmV196SGXhW/X3VvqVH5 ThI8hGvm8N9ffOupVMBWcgsDiv4UUfSvyB28dl3u44UAKp2nm75KiqY7rz+qOnsJSgli ZUmZ9xWtsBDnzQyop83ktdPKfZr2AylutstX5Z443CnyQ9xvfnku3PEddc/k5cCVJ53s yqIQTuODWylnwWvm+7KS2/J1EGtQuue3zg87+FHF7zEbA3vjeHwIfOkkcZ/fqtBoEL+s rvuKjdlxMsFTrPz51rB3lzx5gv82vveKT3RTuaH9UgXbQkEwTmgwzc2xqvJU7YBmPyxJ LRoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ce11si2526196plb.420.2019.02.14.03.24.04; Thu, 14 Feb 2019 03:24:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436561AbfBNGks (ORCPT + 99 others); Thu, 14 Feb 2019 01:40:48 -0500 Received: from mxhk.zte.com.cn ([63.217.80.70]:55744 "EHLO mxhk.zte.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387576AbfBNGkr (ORCPT ); Thu, 14 Feb 2019 01:40:47 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 3DE99F9B18BD5CD5A489; Thu, 14 Feb 2019 14:40:45 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id x1E6eWtG050422; Thu, 14 Feb 2019 14:40:32 +0800 (GMT-8) (envelope-from huang.zijiang@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2019021414410260-26035759 ; Thu, 14 Feb 2019 14:41:02 +0800 From: Huang Zijiang To: nicolas.ferre@microchip.com Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, wang.yi59@zte.com.cn, Huang Zijiang Subject: [PATCH 1/2] net:ethernet:cadence: Replace dev_kfree_skb_any by dev_consume_skb_any Date: Thu, 14 Feb 2019 14:41:18 +0800 Message-Id: <1550126478-28316-1-git-send-email-huang.zijiang@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2019-02-14 14:41:02, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2019-02-14 14:40:21, Serialize complete at 2019-02-14 14:40:21 X-MAIL: mse01.zte.com.cn x1E6eWtG050422 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The skb should be freed by dev_consume_skb_any() in macb_pad_and_fcs() when *skb is still used. The *skb is be replaced by nskb, so the original *skb should be consumed(not drop). Signed-off-by: Huang Zijiang --- drivers/net/ethernet/cadence/macb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 1d86b4d..5a63ac5 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1698,7 +1698,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) if (!nskb) return -ENOMEM; - dev_kfree_skb_any(*skb); + dev_consume_skb_any(*skb); *skb = nskb; } -- 1.8.3.1