From patchwork Mon May 29 18:31:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 768298 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wc51q5GNNz9s65 for ; Tue, 30 May 2017 04:32:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="okuU8qT7"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751145AbdE2ScH (ORCPT ); Mon, 29 May 2017 14:32:07 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:35368 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbdE2ScF (ORCPT ); Mon, 29 May 2017 14:32:05 -0400 Received: by mail-pf0-f174.google.com with SMTP id n23so51211486pfb.2 for ; Mon, 29 May 2017 11:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v7vnJOhzlzFZgIcP/ad0Y6w5DZHTEEVXvrMeTEASUoQ=; b=okuU8qT7ymEIHaHc7SfyLLT7FodHyVipGIAl+9JkLgwcSJ3l5R8jOmrUReiWsZvREB T3MQ2h5liuIBsuMgeGmOGKnR8twSx19peS9sp+edgGeIMD4TJ/nwo3Tir0oD7geQJpC+ ptyVz2zWGGGqRi3sXXTtiQLQLTkqBE2E8ja7PHvjca78pqzGcgYvSaN7Ktdr96fMgtX4 zcsaneY4tKJg71wV3no5Dw7al6oLUWlHTN+0u5qOrMpNDNaYks523JnpO0SqsTt4dYU7 G3q6yN7h0UVfGSsKcqOFaKaDRumMKM4hsA6CzMaTMym1Ixss6dX18/woh4YlXu7RSVzJ c/Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v7vnJOhzlzFZgIcP/ad0Y6w5DZHTEEVXvrMeTEASUoQ=; b=FPNbmiWP+hBkV6kTD84Y7In197T0zQVy4HdbTFVhCR5NXVzjLZlZYJLak3fqLbwx/4 ynRdhdI3Gl27NPEn3R+1PnQv/cXApyrifftx5CSbw9U1iMb0P74madMSCowMyIEwyjMz 7V5LQ2/V8jUwKmfjT6yYTJN/1H0ihnO4iFNXm7BcGLucOk16hzF0sbMUj0//yY67kBoE E7liR3O1mGuxQZmAdizKPw6ik7k8w9kIY3NT76knsW/YiH//C63trDBLggTgpwJ6mFAN FFmThbiXNOOG+mbDpiExRRRAIjOjGHg8TH+Kj6hrobb9O7H4N7mbLgv7VyFJcrT5aC0c aOPw== X-Gm-Message-State: AODbwcCti2uTdZU+XOWvBMFKTnnksiODB4xc3tyFjzOQ5ysbTRf6e7nY E5ILUSBO2MZYr9u9 X-Received: by 10.99.23.100 with SMTP id 36mr20560455pgx.118.1496082724946; Mon, 29 May 2017 11:32:04 -0700 (PDT) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id 204sm16007722pfu.19.2017.05.29.11.32.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 May 2017 11:32:03 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: davem@davemloft.net Cc: netdev@vger.kernel.org, Stephen Hemminger Subject: [PATCH net-next 2/3] netvsc: use hv_get_bytes_to_read Date: Mon, 29 May 2017 11:31:58 -0700 Message-Id: <20170529183159.22205-2-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170529183159.22205-1-sthemmin@microsoft.com> References: <20170529183159.22205-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Don't need need to look at write space in netvsc_close. Signed-off-by: Stephen Hemminger --- drivers/net/hyperv/netvsc_drv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 548c78863ce9..c3e0277186bb 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -118,7 +118,7 @@ static int netvsc_close(struct net_device *net) struct net_device_context *net_device_ctx = netdev_priv(net); struct netvsc_device *nvdev = rtnl_dereference(net_device_ctx->nvdev); int ret; - u32 aread, awrite, i, msec = 10, retry = 0, retry_max = 20; + u32 aread, i, msec = 10, retry = 0, retry_max = 20; struct vmbus_channel *chn; netif_tx_disable(net); @@ -139,15 +139,11 @@ static int netvsc_close(struct net_device *net) if (!chn) continue; - hv_get_ringbuffer_availbytes(&chn->inbound, &aread, - &awrite); - + aread = hv_get_bytes_to_read(&chn->inbound); if (aread) break; - hv_get_ringbuffer_availbytes(&chn->outbound, &aread, - &awrite); - + aread = hv_get_bytes_to_read(&chn->outbound); if (aread) break; }