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=-6.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 7282CECE566 for ; Thu, 20 Sep 2018 14:43:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E16E21532 for ; Thu, 20 Sep 2018 14:43:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="MVFSBRAa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E16E21532 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733117AbeITU1k (ORCPT ); Thu, 20 Sep 2018 16:27:40 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44443 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733042AbeITU1k (ORCPT ); Thu, 20 Sep 2018 16:27:40 -0400 Received: by mail-pf1-f196.google.com with SMTP id k21-v6so4471112pff.11 for ; Thu, 20 Sep 2018 07:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IMh67bFzXYsSjFzkNuNujAEl+sClz0tuOhbC4dpgoyY=; b=MVFSBRAaOMdYp78m+VvV0KS64e98NrH22dreGFDk6vsFfL01kzDgd1Ko2qLc3kgWRz 7mqCwSNfJP9CtozlgY0mtYO1tXoj6SglHM6UDasGICKpCEeCBwc+vMkJ+HG+p3R//6cB 8ffKAmMmFDVN/xVy6HXC6r9cGd2BGQ1T2TzyGqcN0cwMCrkKaY1f00mmE21CyCmzzjQt q2u8Beo0i7dv+TqPoNJJkMEqetqPd4N4VZFuL7YoycD/JMrbxxrQYRGFYetYO0V3DBfs t0ApGAAkspgK1KaUM+cKE17aP7EgvnGOnnWR8W/aozDQIp+Tvnrj9AIuyRwoosOUdE7U dUvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IMh67bFzXYsSjFzkNuNujAEl+sClz0tuOhbC4dpgoyY=; b=jSc4PdJyyTfuEzF17aNmSrEfV66YFSgxCFf3QbjCGTapadv9Ft9QBVo7V1SkGkf/ZQ /3rhEET2E+L3lLZ0e/F4pTmu+x5uG/wG+MkD7OONXXvmq6Sd6ROCe99A3dcC+C4F+HWC W0xm/FHuEmdPt3aXINAXRMCnvY2qvewJc5xfHd0Ka4gbgZ7cTP/JdAgND5EwUV6WhmJj oC1LsA0DDKw9f3dSfmTDOM6fLA9I4fq5viitxTau3uoSDtBxqINgVzOmxMsmmrccFdAZ lWoaQRtJkmGBD6LjlJGr1IHMumpJHFDNKcC69evrOcRYCQ6Lk3J+TJ+wwsUgeVas3ULf LNlA== X-Gm-Message-State: APzg51AqHwleyrhYV9tSfVHrWkd3I03MVzAuB0Qf573r6scYNDchBCM4 CiEuZ0BMzeTG0A4SgRQj1BrCvQ== X-Google-Smtp-Source: ANB0VdYM2sBsQnur3DMAujjKHWPQW5D5y7H5a410AT3i3x3IPqnGGB48FgtI+gNnyg/ydCE9uQG9OA== X-Received: by 2002:a63:350f:: with SMTP id c15-v6mr22634069pga.206.1537454631125; Thu, 20 Sep 2018 07:43:51 -0700 (PDT) Received: from xeon-e3 (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f62-v6sm34456294pfg.74.2018.09.20.07.43.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Sep 2018 07:43:51 -0700 (PDT) Date: Thu, 20 Sep 2018 07:43:41 -0700 From: Stephen Hemminger To: YueHaibing Cc: , , , , , , , , , , , , , , , , , , , , , , , , , , , dev@openvswitch.org, linux-mips@linux-mips.org, xen-devel@lists.xenproject.org, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, devel@linuxdriverproject.org, linux-hams@vger.kernel.org, linux-omap@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH net-next 17/22] hv_netvsc: fix return type of ndo_start_xmit function Message-ID: <20180920074341.3acef75c@xeon-e3> In-Reply-To: <20180920123306.14772-18-yuehaibing@huawei.com> References: <20180920123306.14772-1-yuehaibing@huawei.com> <20180920123306.14772-18-yuehaibing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.