Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp74803imm; Thu, 20 Sep 2018 18:38:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYMs2jrQ+w6fu40bpKN7jo6S+fMQds/WTqxDwZeMOJHfVzGPzFo/Wk8eNNu4tMAgiyQVxkP X-Received: by 2002:a62:ba0b:: with SMTP id k11-v6mr44124646pff.171.1537493919058; Thu, 20 Sep 2018 18:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537493919; cv=none; d=google.com; s=arc-20160816; b=HlQOgANkrFwLWOZ9BEvcn63wt0a1+jNwjBSbWW55/CcFXJWGGmmQxr4ahLGWSn8q73 hK6xr4SdoXNROVZ+iXtfiQI+2h+Fph5ziIGsS/gQGUp0HluxnbfuP1dE9oiOKB7jx5ll JG57qbK75pHMHiKKlrTI2t4psuVM+suFKy5fscEsSxNUaM6nTN6Yv6faZ8KdxxbtDi62 0xrmPpSlW+OJExIpxb7/CY18Q43VJTh20pv7QCw98RDFB7eHnBJMigQKCUkXs3or1V4k Q3hyHsvJKvWRQHDXl6qnUJ6BlcDtk6RZEhGP9Zu/H9dOfW/Jtcdh05qGaPyKAgIjufBL gXjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:cc:references:to :subject; bh=GqVENcNci99pMBYqYmwQIEXcsCQjZSWqELD0vgjmKNI=; b=ndDqGURc13bq8uL4haXxPwgVWlGghUFa0V//CqFmA32RCBaGxu8UU1JQLpArYDdmY8 Y9T5gCx112obZpNvZWGlVDtb6Wnl4IanK9d77I7TD3axwXUbYhZiT8/mUkKiyQ/ZKvi8 Rd5Or2Ttw/+IWHYsgnPdey4Pp+wnGlgdAPz37huLhsg6P31HyjwIRyoUZrvY973B6ptt MKlGkJ+CHEumxa4BCHN/ZUL8Zw/HynwOjW1jH+8I8l1qBsKCWDvdvDxbXazDIKTIaVVu 9/lrCBbnFDLGSAs9ovOYn80kDmP+e82feB8YdedTTo2RFV1/P0KCkRA0wCOWZMX2TQnF ijog== 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 9-v6si421351plf.345.2018.09.20.18.38.23; Thu, 20 Sep 2018 18:38:39 -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 S2388876AbeIUHYT (ORCPT + 99 others); Fri, 21 Sep 2018 03:24:19 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:12663 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388788AbeIUHYT (ORCPT ); Fri, 21 Sep 2018 03:24:19 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 563E5E8431EDA; Fri, 21 Sep 2018 09:37:53 +0800 (CST) Received: from [127.0.0.1] (10.177.31.96) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.399.0; Fri, 21 Sep 2018 09:37:53 +0800 Subject: Re: [PATCH net-next 17/22] hv_netvsc: fix return type of ndo_start_xmit function To: Stephen Hemminger References: <20180920123306.14772-1-yuehaibing@huawei.com> <20180920123306.14772-18-yuehaibing@huawei.com> <20180920074341.3acef75c@xeon-e3> CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , From: YueHaibing Message-ID: Date: Fri, 21 Sep 2018 09:37:50 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20180920074341.3acef75c@xeon-e3> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit 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 On 2018/9/20 22:43, Stephen Hemminger wrote: > On Thu, 20 Sep 2018 20:33:01 +0800 > YueHaibing wrote: > >> 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/hyperv/netvsc_drv.c | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c >> index 3af6d8d..056c472 100644 >> --- a/drivers/net/hyperv/netvsc_drv.c >> +++ b/drivers/net/hyperv/netvsc_drv.c >> @@ -511,7 +511,8 @@ static int netvsc_vf_xmit(struct net_device *net, struct net_device *vf_netdev, >> return rc; >> } >> >> -static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) >> +static netdev_tx_t >> +netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) >> { >> struct net_device_context *net_device_ctx = netdev_priv(net); >> struct hv_netvsc_packet *packet = NULL; >> @@ -528,8 +529,11 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) >> */ >> vf_netdev = rcu_dereference_bh(net_device_ctx->vf_netdev); >> if (vf_netdev && netif_running(vf_netdev) && >> - !netpoll_tx_running(net)) >> - return netvsc_vf_xmit(net, vf_netdev, skb); >> + !netpoll_tx_running(net)) { >> + ret = netvsc_vf_xmit(net, vf_netdev, skb); >> + if (ret) >> + return NETDEV_TX_BUSY; >> + } > > Sorry, the new code is wrong. It will fall through if ret == 0 (NETDEV_TX_OK) > Please review and test your patches. I'm sorry for this, will correct it as Haiyang's suggestion. > > . >