Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1965402imm; Thu, 20 Sep 2018 05:51:30 -0700 (PDT) X-Google-Smtp-Source: ANB0VdagAZMEXdWUVU+O7DbYWVxuIwwo4YQIZGLX3259L24BWISK/BQQE61xPxD6Q98YDUKqOfu+ X-Received: by 2002:a63:a919:: with SMTP id u25-v6mr34603434pge.211.1537447890727; Thu, 20 Sep 2018 05:51:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537447890; cv=none; d=google.com; s=arc-20160816; b=WL0mpqKNLT/Br576dg5VlHgDIGgO+2rTsQyZj6L21Iap7ASeg7qgakjN2KETNpErBP qiQmldlzb8BNP0h3FEf4Hk+om/xP4xSGSDMaiovDxTDurHn/Q4NZRpgYQwQ+hkdGh2SF gdA72ULqnVoba6qS7c0R+S3zvceh5iucCAUqq25//0HtLPcea9JRpCzGMd/O+DsE375U 3N6F51JHWIu/rQb/R1rLw6gX0DP18Ddu985mhs8DFWz5gOdphPsCjzT0odwqb2dARBRS HAWslq2mFUsgRkRdgGnCUNytQIERrT3nqNHJgt3Jy81LeeURRA7M7MIM6/8AbSwsFO6u /DtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=TNxhYpNCTA0zbNtf3pW5w+/BQr11ehJOeNtxOYV/4Jc=; b=sfpKhrwu1EON2DbNeWW0loWXpcZ9g+Jr+T3wujBscrwLF+UFoGCyX8euyDl49B7Inf WfuV6ISPJl2VV7EBIBiq8NsEA5gvH2D74QxNYZmdeh0Rjd+oiDkA/ugJmfQIVOQo0MzX 98XRvoFfciHvyB9lq8rHn3wHSftapXgz4T5fC9R+TWQYoLI/dRLLtGaFviB8tnmeZQ8R a0lKHjLX0yKD4PHZi2/jW6VMnWLdYvKoVAAp2HJ3d/XVIHkMaafmzqwODHu0DR2PAtve 7ds/E7+oremsdSA19tibEwlIdN+Ru3nL9DNZVBeawLmtXULIFBWU283cDLvcOeduq/U4 mglg== 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 l64-v6si21713486pge.420.2018.09.20.05.51.15; Thu, 20 Sep 2018 05:51:30 -0700 (PDT) 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 S2388085AbeITSbp (ORCPT + 99 others); Thu, 20 Sep 2018 14:31:45 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:12642 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387705AbeITSbo (ORCPT ); Thu, 20 Sep 2018 14:31:44 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 1621C7A851765; Thu, 20 Sep 2018 20:48:20 +0800 (CST) Received: from localhost (10.177.31.96) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.399.0; Thu, 20 Sep 2018 20:48:11 +0800 From: YueHaibing To: , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , , , , YueHaibing Subject: [PATCH net-next 06/22] net: wiznet: fix return type of ndo_start_xmit function Date: Thu, 20 Sep 2018 20:32:50 +0800 Message-ID: <20180920123306.14772-7-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20180920123306.14772-1-yuehaibing@huawei.com> References: <20180920123306.14772-1-yuehaibing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.31.96] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t. Found by coccinelle. Signed-off-by: YueHaibing --- drivers/net/ethernet/wiznet/w5100.c | 2 +- drivers/net/ethernet/wiznet/w5300.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 2bdfb39..d8ba512 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -835,7 +835,7 @@ static void w5100_tx_work(struct work_struct *work) w5100_tx_skb(priv->ndev, skb); } -static int w5100_start_tx(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t w5100_start_tx(struct sk_buff *skb, struct net_device *ndev) { struct w5100_priv *priv = netdev_priv(ndev); diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index 56ae573..80fdbff 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c @@ -365,7 +365,7 @@ static void w5300_tx_timeout(struct net_device *ndev) netif_wake_queue(ndev); } -static int w5300_start_tx(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t w5300_start_tx(struct sk_buff *skb, struct net_device *ndev) { struct w5300_priv *priv = netdev_priv(ndev); -- 1.8.3.1