From patchwork Fri Aug 5 18:00:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adit Ranadive X-Patchwork-Id: 9265657 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7CB1360839 for ; Fri, 5 Aug 2016 18:01:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7347128426 for ; Fri, 5 Aug 2016 18:01:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6779628457; Fri, 5 Aug 2016 18:01:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A71DC28426 for ; Fri, 5 Aug 2016 18:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759151AbcHESBR (ORCPT ); Fri, 5 Aug 2016 14:01:17 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:38733 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760346AbcHESBM (ORCPT ); Fri, 5 Aug 2016 14:01:12 -0400 Received: from sc9-mailhost1.vmware.com (10.113.161.71) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Fri, 5 Aug 2016 11:00:17 -0700 Received: from EX13-CAS-001.vmware.com (smtp-inbound.vmware.com [10.113.191.51]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 89B9618574; Fri, 5 Aug 2016 11:01:10 -0700 (PDT) Received: from EX13-MBX-039.vmware.com (10.113.191.190) by EX13-MBX-021.vmware.com (10.113.191.41) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Fri, 5 Aug 2016 11:01:10 -0700 Received: from EX13-CAS-002.vmware.com (10.113.191.52) by EX13-MBX-039.vmware.com (10.113.191.190) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Fri, 5 Aug 2016 11:01:10 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.113.170.11) by EX13-CAS-002.vmware.com (10.113.191.52) with Microsoft SMTP Server (TLS) id 15.0.1156.6 via Frontend Transport; Fri, 5 Aug 2016 11:01:09 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=onevmw.onmicrosoft.com; s=selector1-vmware-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gq58NthqPdwfGIh3bCRDtLr9HsPhzdn8AfpjW8u/WbY=; b=H18RaA7N+4XsalDfNK+VT1MvJKY7Fq4w5u/FueERShfJMQRyVkqHQhYU7wpRfwBUXyLTYUbYMOr6pGJvwUEthXpTWDfcVg6c5UJHHXhXHKV3ETisHLSIDN8gsKz895pMidXEjv1YofIoitJBm7cMz0VzpJUam30AHJd5vf5cZHE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aditr@vmware.com; Received: from promb-2s-dhcp95-136.eng.vmware.com (208.91.1.34) by BLUPR0501MB836.namprd05.prod.outlook.com (10.141.251.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.557.8; Fri, 5 Aug 2016 18:01:04 +0000 From: Adit Ranadive To: , , , , , CC: Adit Ranadive , Subject: [PATCH] vmxnet3: Move PCI Id to pci_ids.h Date: Fri, 5 Aug 2016 11:00:39 -0700 Message-ID: <1470420039-23125-1-git-send-email-aditr@vmware.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [208.91.1.34] X-ClientProxiedBy: CO2PR11CA0034.namprd11.prod.outlook.com (10.141.242.172) To BLUPR0501MB836.namprd05.prod.outlook.com (10.141.251.150) X-MS-Office365-Filtering-Correlation-Id: df1883ea-c5e2-4031-c3de-08d3bd5a78be X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 2:ExWbxee894XgVeb0NR0qFSxovB6YxLgrjDcuKe3nenG3PQv42Tl4GSbos+3E6Fd3l1d+5EmdXc/Zmj+zEVcsGQtSZ2PUPEq9Q4pcQwTgcySqRf8i5Ik6WN8sa30s71un9rluafJByyjg8/PhKLJnU9ZAAvdzEYV02od54jO0Uuy7t39O9YTIT9bopW35NfEZ; 3:5Ov4PAObdSuC9o5c7yMoL0FgHUV3yp0cni0wNAqTaIc+hdyaeSILKWnfnQyA3fSO3i5egNZwDh2qQYSa2SBDnkyllAQbsyVlbaMBzUYwv2kcCHSXxU8lZEMYd/NiZ2J3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0501MB836; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 25:IvURaMDlKAJ4CKD6JZrJw4lFU/9E7EKhZJVa4mOEkMMZkinXeDj78ShSrkeljN5dUOFS/6Qo3NyH7ukRf0aS3rtXymuvaT+xMWe89OZdkqE/pNFd3u5Vlsbd/hY52Lz0l6ukC9DHYHKYZY7XpBndlSY+jgUpJkb+tXcnkwcNRGx8Ku4A9OqAVRw2GrNzJIE7QRKQEJ0ptw5YcxQawE1dCybqoYmeX10UUFkhLapJ+ie8GuMQ+psRTmhbehaQI2Ozuu2pzhUkyBXBbAABnXm0spX+2zhZ9qrdqEDkFm75RfZc+CqmYv76ZGp78dVHhFlis07lvlXxC20Nf7bodIlFNvxYdFDCY5uciQCW7q9Ss/nnEp4Z9BZB4/3ZX46/lUi9uD2qXsBozSw1HA/Op4nzQ43ztBV0oP0RvSrnHgskDA0jDiXR3hFg9sdBnWauw3pJDqRxzPtTyM1IwfW+Yi/MAXeWeIFblY/DFxmBjw2wPrZ+eOhFSUp/AK8RQeMC6iycvIj32VRQR9m3Y/4CqACML5YyoDb2HqAY0mbdDWOXhVH63b4kd8/DEyyHTiNMX8c2ACgtkERHvI+FzVfSXhsR5hToiShib0UB9XvuqoNOLFpYyiJfijV49JfjI8RhNX0OJUgKfZWVtxu/DeBEIjo/Lt+ZQoXRXK4611jqQaVNTosfdru1ahCg5nl6CefVm9Rb6X7VJTcag+XXfoN03S+WSw==; 31:Q9dsa6e6rfbLLAQx9u50U56+P6NlHc2WdikhBsDcsxLODelxIKDgaibRkzcXzFjZhfY4lRd3cvWsRz7ADt5DFV/qdjHKDvlJ+XIGTqTejDgOxLp9aZmL2DqoLwmn0GVUY+5qlPOQbkf0IgJW/BSisSGzGmAPf5Xzb5bYC1gZ2uUqMHHlaftoFqikzbug/MSDdDALCtQlsMqC fH87q3UiaP9zqwdGwvZvUIndLjjsxM4= X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 20:UFkgCS/SPNnItxy5NWMnvXwq04w4Kv9nseea21npGXp6ENSb83a4YaT1gElg+x3t68zDaq3JlzGDLlsODL7tHyfDGfGNVthFBT9gDvRWObjpuPknm3ugyXJzM1RRww2oBADWP//2EssLt/wAzAobFdl29rMnQkLSrwRnsrBE3gKJLl912HHSMdVSIJR1GqnvXP3OxKxBTcUSlc4XGHSJHDHPrQGXwwb1NAbPz4TT2s64vjSSLeEWU4X3voBxY7A7; 4:etgyomyjVSYthwNFoVaddXAxJ2oZtYgTkHBHpz38ZuyJvajnENSZtm6+aNru+NsnHKaxPwBbKMQTASEI3bntPmwZrw6z/qEZ3kMW5JZqJFegh29dQHzhNlWSdU9aA3cVtZwkGeP9sO6hkplw3LMJ+43QS5NK8l2qOiA2alg7mNIxG+LiXjr/B8irLJMeH24l8PwwLRp3Nkp63eGCe5wb5YlpIzl7rCIiHchUToSspFmX++/mpK3b/mK4Q++nQRDLmHNptKCM3kIR051TzxEpb6JEmXJVIPltnFhqBnA47bQGtvbHPmG7uOsLbIA1ZwXLW9FjENdQEMKjpXT3ynxd4SzcTJmRm6bTY0Qa6mHMl0vB2tKOCTn4vdUOt4g2+uOwHYTq2hreARUR3FXK5WpJDG1m1DGx9SkJboPnJh4W4s8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046); SRVR:BLUPR0501MB836; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0501MB836; X-Forefront-PRVS: 0025434D2D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(50226002)(8676002)(106356001)(50466002)(50986999)(229853001)(305945005)(101416001)(6116002)(3846002)(5003940100001)(19580395003)(19580405001)(2201001)(68736007)(42186005)(36756003)(189998001)(105586002)(48376002)(86362001)(7736002)(4326007)(66066001)(33646002)(97736004)(2906002)(7846002)(77096005)(81156014)(5001770100001)(47776003)(81166006)(92566002)(586003)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB836; H:promb-2s-dhcp95-136.eng.vmware.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (EX13-EDG-OU-001.vmware.com: aditr@vmware.com does not designate permitted sender hosts) Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0501MB836; 23:dGXkYaKtv4leLJs0ti9YMKuvF+zdyaUBAjo9pkSz?= =?us-ascii?Q?a5ktScZdebRkVLmXRlLbJErocdxiLzKyu22TzoLeIAzKIfQMh3ly5dE71Ksn?= =?us-ascii?Q?BM5dKPmfE+P1R072l9nH42ztB9gGEULEn+zB+bpmEheJRPbGCT3z/b51oBqE?= =?us-ascii?Q?L2EuQpPnJ9bPnsLKwIJCAwaxoOwB8LFpBMFB2PvaIzlICLcCIhEqbvMS4XFQ?= =?us-ascii?Q?hdDQY2ZAR/kJ76irvbUqT8zCRo6iZbLT5C2JegNQsXQHuf+Vh4gjUas1Pcqn?= =?us-ascii?Q?i7HCxrpWVPtBrKc5gesLr/TKvMz5g+h2RldpG3iANYU27X+dUlnO/h7fLpnD?= =?us-ascii?Q?AFZ5Oz/TvGiSmT7s1k1U15TU/aJjAMmsgBBZSI6ogMvCDhwfB/M2d3VtoSDV?= =?us-ascii?Q?y19BiLGY6JFm6MnA7e7BwKuIR9QHEt/o/2xuc3eyuWHPbBAGneVpH54XU2uX?= =?us-ascii?Q?zdpJzKj81RTNrZAO3j1sbjr6daB/DVMP/qITN5uXTvOkvCeupKqiGGqx78mr?= =?us-ascii?Q?JxkOX+8okkuGQpWTJ3O8c2t6znrzctF9PFgCQe4q8c7yNFiGSSDTAVEQrMEZ?= =?us-ascii?Q?Nw48gqLSCl8og937T/VCdBWoiASCp+Hn9sfuNbb57BmtKiIPH9doBscEjJy1?= =?us-ascii?Q?5R6RM5HafXiPBJzMj4h5ocV/gxiavPpabhqA5loBJz+D73aNTDJFPbr0qQaR?= =?us-ascii?Q?Yo3ChdzIt2ClXq2NSUgcMyjz39uqVv6peKmijEGr+wum3QLpc2GA17ifXbhZ?= =?us-ascii?Q?I9VxrTw0bsr20LkniwK9rXse+Jn9FUHb6EO5BOAQ7PxNIqHqB8yS2bUwtoTg?= =?us-ascii?Q?KqqKQaEzeTGF9VpQo+dB/2+egYrYxCqhhcVZ9Fz/+IxYvVWl8YMWeqHKtBz6?= =?us-ascii?Q?zLF1smk6TDpgZsDs/VsdAJGq+RVAgfkLTrnyYP7T7AVqvDZLUaSvzvRPQVf2?= =?us-ascii?Q?ZPPdV1PucL4ffVTimd3491z3dX7O16SwiN+SyJQHL8puD5tAZK0VC1zEoaU5?= =?us-ascii?Q?LcekWC23Q+OQsCpOD0VlnO7eR40n82O1Up+YDBTJFRaIwU9wjoonFpzFaGBe?= =?us-ascii?Q?Qsk5xEc=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 6:glfI0K9flgD2idrXE4Hu5Cs8MCoPsnKa0SxqCu/ymg9vYY7paRiVzPDZ5kCet7mt66TXHAw1NHo30fWhkDEwV6ja5rphx8iz8y2XbQZH1CrK0SW2HYn7lNBBKzvGNeiAphS9vDdvvvApW7cF1XjPrceZfXxrUChJAcNcHot/nZ4X3chsDj8Ke05avAM+mWDnasESXbEcAcvDowea2YmEApWYSNQHg+2OgxqnvBAiaeLuX+vPsX7GOWKmRXa5J5GH+0q4iSdPo9crv94eDtDA7tx1ND16vQe4i7Fv8ujd/lQ=; 5:t5fGFDBmNY4tYY93dG4lHKRJXtRMxxlWEWLC4phMzMoYpvqlMTNfx+MsL3dIRjB5xXjsFQVv0zlob6NXwr+QlOlZ0qvYab1yNC6Ewuw7O2vsUXRdV0J+Mu1F50Qsq8x9IxqCXWqgHnQ1KiNqanjzrQ==; 24:bGkzXZ/Oglef3z5RGCRQVPJqXj4NEiMmfeQsFjBb4b1M9fNLr9vC6e17zo67o1UhdfupT5YzKIS5vS57si5+9p6Kdxyd9BVEtDNfEeGB+PM=; 7:GaUU4gxNRqfyyFlijjv0y4YjyR8kMiIzRUDjeVtqWIGPQkYnAnZN6cHnAmdHo+Zq141ohlwkBLgQgEX2/N5b+To68rSHmFgDqw2Wr+59NZnYe4swcMEfM73bxzA+Chm9I7ydxaacg+VM4L/FsVvXZpjD5dmmWHESbDXOAQT5g/PlOkJcl/YhNH5u95LA6OES+i42rfgc8zRV+/hmIqz62l2gFtzHiGBwOen2jPBtKooIPGTbgZIMAai0Zl6viYy2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 20:hwuEUT+tV5EZ1qwJLPlCGI9NzHj0otDVNUHz2GQMiqeggkq9kfa4erMgmVFHaBRpax8/bwpkIl8flRMW/fAE8geLAtbFa6i6Jhkf5YzoigLaWC7CMZNveoH0YoeY1IfA2VQnDkvRdEz2zq7uyGzLR93cZAdYv1L5+QGdwQqXimc= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2016 18:01:04.8617 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB836 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The VMXNet3 PCI Id will be shared with our upcoming paravirtual RDMA driver. Moved it to the shared location in pci_ids.h and updated the driver version. Suggested-by: Leon Romanovsky Signed-off-by: Adit Ranadive --- drivers/net/vmxnet3/vmxnet3_int.h | 7 +++---- include/linux/pci_ids.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 74fc030..be5991e 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -69,10 +69,10 @@ /* * Version numbers */ -#define VMXNET3_DRIVER_VERSION_STRING "1.4.9.0-k" +#define VMXNET3_DRIVER_VERSION_STRING "1.4.10.0-k" /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ -#define VMXNET3_DRIVER_VERSION_NUM 0x01040900 +#define VMXNET3_DRIVER_VERSION_NUM 0x01040A00 #if defined(CONFIG_PCI_MSI) /* RSS only makes sense if MSI-X is supported. */ @@ -119,9 +119,8 @@ enum { }; /* - * PCI vendor and device IDs. + * Maximum devices supported. */ -#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 #define MAX_ETHERNET_CARDS 10 #define MAX_PCI_PASSTHRU_DEVICE 6 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c58752f..98bb455 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2251,6 +2251,7 @@ #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 #define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0 #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0