Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1966521imm; Thu, 20 Sep 2018 05:52:35 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbDirjVvcOa6jmPtkJtyDpfX3Cu9k0j4UyVN9rFdy6xdzoIle4/EmHP+rfjF/TTOpAvnurX X-Received: by 2002:a63:d857:: with SMTP id k23-v6mr5287945pgj.106.1537447955492; Thu, 20 Sep 2018 05:52:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537447955; cv=none; d=google.com; s=arc-20160816; b=1IIFLKwfldHjMbtSJsdaHteZgQuViH9ouVAE8tZo5pzNqJ8JCRPuuRw9vdeF2UOaDu PVx1bBXx9ALiZc/Bg4wpR9GKFXa50YOByIqrrkc9tDx0wDe8thj7ccJZd8xs0Gze1eN9 BNCk++lurj+UvnCKF32LMR3sSTITY61EG4fmwGoL+miZo6UCE2sRJPn8YnWSRqdBWrBs vDxxCzqgFhBwpqcTsqzAXyr+hm9rqkdHwlmMHYXHs2Iuxa3tAQUOyPuxgHZW2+8exbL6 WA+EDFCjGD1x34GgMf9zaDBZC6huu8WxNPcL0/KneNGlQjSKri2ZBwkN/QycZAuwDGmo xZFg== 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=K2xYWcrmG+DGBqE3Ru5LFsF4LXX5i3UzJ4nUPU5e4eo=; b=KG+iHWlyLt6DhvzQFtSs/xGglaMVFtuP9lU/seh47HzRMC+bNMl1VzGSlZfa2j2XOn +7YYfBm60PJ6Pog1CqWffTpxZJ2I8M5ZQO5ctyi/VxGHI6H5liPiBAEVzKOXJP9UZndV xOJIVGy/l39H6eg8Bxh7JqE3Naa7MELv/lx6zVs7M2064JRPj8frnUXzvvtGsNOtQWov a7tIBpPv4PHwkIxAvOxl11DbJGv94EcBi23viFIY2EYt71quiL3mHAlN2EHrvfcDwi/g W47/Vta3sxjO1Z9XppB11qR0dZ3RVCXeB2c/WwGxqxBm+2Sp+TVR5Ku0GgxIsZAPu1rf /VHg== 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 go1si24978550plb.266.2018.09.20.05.52.20; Thu, 20 Sep 2018 05:52:35 -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 S2388048AbeITSbg (ORCPT + 99 others); Thu, 20 Sep 2018 14:31:36 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:58682 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387874AbeITSbf (ORCPT ); Thu, 20 Sep 2018 14:31:35 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id A8DE4404C1F6D; Thu, 20 Sep 2018 20:48:11 +0800 (CST) Received: from localhost (10.177.31.96) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.399.0; Thu, 20 Sep 2018 20:48:02 +0800 From: YueHaibing To: , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , , , , YueHaibing Subject: [PATCH net-next 03/22] net: seeq: fix return type of ndo_start_xmit function Date: Thu, 20 Sep 2018 20:32:47 +0800 Message-ID: <20180920123306.14772-4-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/seeq/ether3.c | 5 +++-- drivers/net/ethernet/seeq/sgiseeq.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c index c5bc124..d1bb73b 100644 --- a/drivers/net/ethernet/seeq/ether3.c +++ b/drivers/net/ethernet/seeq/ether3.c @@ -77,7 +77,8 @@ static int ether3_rx(struct net_device *dev, unsigned int maxcnt); static void ether3_tx(struct net_device *dev); static int ether3_open (struct net_device *dev); -static int ether3_sendpacket (struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t ether3_sendpacket(struct sk_buff *skb, + struct net_device *dev); static irqreturn_t ether3_interrupt (int irq, void *dev_id); static int ether3_close (struct net_device *dev); static void ether3_setmulticastlist (struct net_device *dev); @@ -481,7 +482,7 @@ static void ether3_timeout(struct net_device *dev) /* * Transmit a packet */ -static int +static netdev_tx_t ether3_sendpacket(struct sk_buff *skb, struct net_device *dev) { unsigned long flags; diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c index 573691b..70cce63 100644 --- a/drivers/net/ethernet/seeq/sgiseeq.c +++ b/drivers/net/ethernet/seeq/sgiseeq.c @@ -578,7 +578,8 @@ static inline int sgiseeq_reset(struct net_device *dev) return 0; } -static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t +sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct sgiseeq_private *sp = netdev_priv(dev); struct hpc3_ethregs *hregs = sp->hregs; -- 1.8.3.1