From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966421AbcIHKfG (ORCPT ); Thu, 8 Sep 2016 06:35:06 -0400 Received: from p3plsmtps2ded01.prod.phx3.secureserver.net ([208.109.80.58]:53248 "EHLO p3plsmtps2ded01.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965834AbcIHKem (ORCPT ); Thu, 8 Sep 2016 06:34:42 -0400 x-originating-ip: 72.167.245.219 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com, alexng@microsoft.com Cc: Alex Ng , "K. Y. Srinivasan" Subject: [PATCH 1/3] Drivers: hv: utils: Rename version definitions to reflect protocol version. Date: Thu, 8 Sep 2016 05:24:12 -0700 Message-Id: <1473337454-6097-1-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1473337400-6050-1-git-send-email-kys@exchange.microsoft.com> References: <1473337400-6050-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfEWVbH4OIIjx2I72jYPTtJpr+mL6QhtEdZGN6hczJpb/LiwKA2oqBGhN1ZaZy0g/lCfTmAYEZ8PYZ7LswytLEd5sIQWFGJTpmxrGkl6Qr86L3yIVUk0G zrCfqSfXoV0y0c02XoelhVVebJsUte5J4ophd5AkQWkWy1LikXLCL3eg3xdns8XxIJbRaFgfciJrEL/CZapMbA68tCDlde31R0eg5D5eV10tOQLHPGqzf+9l y+cKH2uqLb/xFmlW+1NVD8vVaEdMcDPn2T3dSuy9yH7ShJRM+bXlSBW5GhhVIC3E+dkPQeSYki6f4uEwL/kAagsQsavn61hdLAP4++hZISYAwTsskyc3f2/A 7QzU0O7QUbzyF1oLGd5Lcmo2y4M+xmL2rXis62IP37RwNY9fdZZJiUMJbMG/prTm3pqlAqueRGYcJL21RWY7K9A5jREsgjyz8i5pQPkPDuYoT0pzIeJpM1Rv a8LT8ayQcWNZ/zzTOTwgUHr819eO/sf9vxQQ2rPF1+PtUyXFU2GZHblot1dLUf54SpkiRvw1pupGB8iQ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Ng Different Windows host versions may reuse the same protocol version when negotiating the TimeSync, Shutdown, and Heartbeat protocols. We should only refer to the protocol version to avoid conflating the two concepts. Signed-off-by: Alex Ng Signed-off-by: K. Y. Srinivasan --- drivers/hv/hv_util.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index d5acaa2..b27a8ee 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c @@ -34,22 +34,22 @@ #define SD_MINOR 0 #define SD_VERSION (SD_MAJOR << 16 | SD_MINOR) -#define SD_WS2008_MAJOR 1 -#define SD_WS2008_VERSION (SD_WS2008_MAJOR << 16 | SD_MINOR) +#define SD_MAJOR_1 1 +#define SD_VERSION_1 (SD_MAJOR_1 << 16 | SD_MINOR) #define TS_MAJOR 3 #define TS_MINOR 0 #define TS_VERSION (TS_MAJOR << 16 | TS_MINOR) -#define TS_WS2008_MAJOR 1 -#define TS_WS2008_VERSION (TS_WS2008_MAJOR << 16 | TS_MINOR) +#define TS_MAJOR_1 1 +#define TS_VERSION_1 (TS_MAJOR_1 << 16 | TS_MINOR) #define HB_MAJOR 3 -#define HB_MINOR 0 +#define HB_MINOR 0 #define HB_VERSION (HB_MAJOR << 16 | HB_MINOR) -#define HB_WS2008_MAJOR 1 -#define HB_WS2008_VERSION (HB_WS2008_MAJOR << 16 | HB_MINOR) +#define HB_MAJOR_1 1 +#define HB_VERSION_1 (HB_MAJOR_1 << 16 | HB_MINOR) static int sd_srv_version; static int ts_srv_version; @@ -350,9 +350,9 @@ static int util_probe(struct hv_device *dev, switch (vmbus_proto_version) { case (VERSION_WS2008): util_fw_version = UTIL_WS2K8_FW_VERSION; - sd_srv_version = SD_WS2008_VERSION; - ts_srv_version = TS_WS2008_VERSION; - hb_srv_version = HB_WS2008_VERSION; + sd_srv_version = SD_VERSION_1; + ts_srv_version = TS_VERSION_1; + hb_srv_version = HB_VERSION_1; break; default: -- 1.7.4.1