From patchwork Mon May 14 22:32:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 913334 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org 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="M85+hRdh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lFqj01fmz9s1B for ; Tue, 15 May 2018 08:34:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752473AbeENWeV (ORCPT ); Mon, 14 May 2018 18:34:21 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:34311 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752090AbeENWcf (ORCPT ); Mon, 14 May 2018 18:32:35 -0400 Received: by mail-pl0-f66.google.com with SMTP id ay10-v6so8176349plb.1 for ; Mon, 14 May 2018 15:32:35 -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=a/HTGqXbWhxmCg8PClXKkAvw3yKSQnwMi/+A34Dcx64=; b=M85+hRdhepWiNoRkNk++ydDTvhl87bulnsr/A3h3mxro5zPsxGBdjE2nZmWKT7zI4D Fiq9Ew9aebN/31CiOwL/oeOOZRmMT4GsE/9TWe46qt1C/OYukZLDaBKjYC4LK4tv1rM3 FjFlSZfGSVhlHB/HBDkeu4fDqyK8cLWuZLCJo7K9UbW2pQDqkY93aJfXqPnEFT4ED7Qj 8QTYgQLcUAUfJqmzy7DbsZB9Yj9bHihGoDHXBKHjzN8nLY/wkGARiYRVgbbZSmzpiiA4 bb8/oBX7SlWrxWFTRcnTzjJnVsiLsL2SRNG6h0ik7tJ35ClbZg19CpkdIBPmrSKnhb8d xISw== 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=a/HTGqXbWhxmCg8PClXKkAvw3yKSQnwMi/+A34Dcx64=; b=uVZCKogvZztwmtP5s7yh0CBqcIkzZde74n8Ji29vhoF7uk8mBCX7SU/laoBiX3y/vv M86nekV2iFjaoCM35pUgPRhYOQDr1WdzojHTP1Z9cR+uLg3BZlIC+Cnw5Ewv55Dh3D/P ObLxTQlNRd/8lBgOAYUYPM26pVJZW62OR+lmdBxewqwY46BYcvI6Fb4N4QeleQQYrFsj Ar0bMjZv9sK31QA8SBni1y1GE4wbZXfVcbE7Kw+hrmL11HFoFuhU40ljJoSWJ+2H9XIi EjKS4OdmsYrjJBhSkXVMMqDTfJtjTTj5sVU7TRTAm0Ed1C5jU7CIkH33ledxuRwmeI/9 NcHQ== X-Gm-Message-State: ALKqPwduwryVgekCiXT6XczqKt/j2XCREVvwypVkF91cxOk4LNrFORKa kzU6Su4wIf8pToclRs0pZfsOQg== X-Google-Smtp-Source: AB8JxZqsXD/Z/qNdcTrM6Zpu3bxS3lUbHQXKE7DghFtnyyoQiIoXqP36W2XBE8RnfOLT1UuFwVONIA== X-Received: by 2002:a17:902:59ce:: with SMTP id d14-v6mr11779897plj.253.1526337154975; Mon, 14 May 2018 15:32:34 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id y29-v6sm23827830pff.42.2018.05.14.15.32.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 15:32:33 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: davem@davemloft.net Cc: netdev@vger.kernel.org, Haiyang Zhang Subject: [PATCH net-stable 03/24] hv_netvsc: Rename tx_send_table to tx_table Date: Mon, 14 May 2018 15:32:02 -0700 Message-Id: <20180514223223.25433-4-sthemmin@microsoft.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514223223.25433-1-sthemmin@microsoft.com> References: <20180514223223.25433-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Haiyang Zhang commit 39e91cfbf6f5fb26ba64cc2e8874372baf1671e7 upstream. Simplify the variable name: tx_send_table Signed-off-by: Haiyang Zhang Signed-off-by: David S. Miller --- drivers/net/hyperv/hyperv_net.h | 2 +- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 8144b938460f..94de7ca1e52e 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -734,7 +734,7 @@ struct net_device_context { u32 tx_checksum_mask; - u32 tx_send_table[VRSS_SEND_TAB_SIZE]; + u32 tx_table[VRSS_SEND_TAB_SIZE]; /* Ethtool settings */ bool udp4_l4_hash; diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index a6bafcf55776..03b44ec805db 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1107,7 +1107,7 @@ static void netvsc_send_table(struct hv_device *hdev, nvmsg->msg.v5_msg.send_table.offset); for (i = 0; i < count; i++) - net_device_ctx->tx_send_table[i] = tab[i]; + net_device_ctx->tx_table[i] = tab[i]; } static void netvsc_send_vf(struct net_device_context *net_device_ctx, diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 8b358d3fc057..f5d299b82bac 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -234,8 +234,8 @@ static inline int netvsc_get_tx_queue(struct net_device *ndev, struct sock *sk = skb->sk; int q_idx; - q_idx = ndc->tx_send_table[netvsc_get_hash(skb, ndc) & - (VRSS_SEND_TAB_SIZE - 1)]; + q_idx = ndc->tx_table[netvsc_get_hash(skb, ndc) & + (VRSS_SEND_TAB_SIZE - 1)]; /* If queue index changed record the new value */ if (q_idx != old_idx &&