From patchwork Thu Jun 8 23:21:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 773573 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 3wkLzL3QYKz9s71 for ; Fri, 9 Jun 2017 09:21:50 +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="aiSxcz0Y"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751548AbdFHXVk (ORCPT ); Thu, 8 Jun 2017 19:21:40 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:36246 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751527AbdFHXVi (ORCPT ); Thu, 8 Jun 2017 19:21:38 -0400 Received: by mail-pg0-f43.google.com with SMTP id a70so20575863pge.3 for ; Thu, 08 Jun 2017 16:21:38 -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=UN9xUzuibahBHz0DnvHbiuHHWdX68ws5GrYWsB2+SVo=; b=aiSxcz0YJjHJfaUgGDoOHMztNUyPsOpSbGMiYXWgcjKpm92ndYgAvUlk5Uv29UfBjv lgRjYBUp5KG0D91bMX0wgkWJjuloNJxsc8JnW4aq6sa7P/EKduTclceNUkKaBRGaa7yl 8Zc02PlurJbTnzrNLkKhDwHNYgsxPspQHgsD7z40mFEcUAIJwL+tvLlGXhsByHihqzw5 NwiAnUVj2XXPLhRAs/hLNSzNPTqicYSJNQrpoDLwiDlKdj54ymGnARJpxCLgIH9ZNDY1 fgmrF8M9MMNgesdhy6EWgru0I18IKgGeqBcRfoOHkR80BN1xZPOyy4CEsnM9XixFrT5S nVVg== 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=UN9xUzuibahBHz0DnvHbiuHHWdX68ws5GrYWsB2+SVo=; b=SlZtkAZEnp9fOkgZZjOvMS7wLthQ9wnnnboP19QKvWzyeu4e3eaec3RQ+cmCNQapbp Z5icjdgBuVoBTVOqA18l/8+4yDxg8V6K1Va2nYUVRygtyBMGvhJcpNPwfudoTxtCoP1E CDYMfx+HtK529Se241Dght3UO7dN+rCsUO+mfcfcMlGoZ6pjPKxyUuUNcGD+efn9ePKL JAUHTOzN83dCEBilqSLGNtOA1RDp1f5H/BKaFBSWzGI6jA3n3qqzSS4Az9+p0hyoS7yo 1VfYcEG/3NSUld9FwRaI73wewg0bPawLBfn1NWEMJBZV6hv9WRp4CRoyv1OYegxdxjjL NKyQ== X-Gm-Message-State: AODbwcCmjDxEmzf6Z2A4CNcJXd0o4KBzbMwY6qiqPearOrfuqBjTfrDc dAzqTWZR9SUQS3wz X-Received: by 10.98.163.25 with SMTP id s25mr38998872pfe.217.1496964096283; Thu, 08 Jun 2017 16:21:36 -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 s17sm12345417pfk.112.2017.06.08.16.21.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 16:21:35 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org Subject: [PATCH net-next 4/6] netvsc: mark error cases as unlikely Date: Thu, 8 Jun 2017 16:21:21 -0700 Message-Id: <20170608232123.28366-5-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608232123.28366-1-sthemmin@microsoft.com> References: <20170608232123.28366-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Mark if() statements used for error handling only as unlikely() Signed-off-by: Stephen Hemminger --- drivers/net/hyperv/netvsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 652453d9fb08..caf89a245ba6 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -855,14 +855,14 @@ int netvsc_send(struct hv_device *device, bool xmit_more = (skb != NULL) ? skb->xmit_more : false; net_device = get_outbound_net_device(device); - if (!net_device) + if (unlikely(!net_device)) return -ENODEV; /* We may race with netvsc_connect_vsp()/netvsc_init_buf() and get * here before the negotiation with the host is finished and * send_section_map may not be allocated yet. */ - if (!net_device->send_section_map) + if (unlikely(!net_device->send_section_map)) return -EAGAIN; nvchan = &net_device->chan_table[packet->q_idx];