From: VMware, Inc <> Date: Thu, 15 Oct 2009 21:35:22 +0000 (-0700) Subject: Internal branch sync. Included in this change: X-Git-Tag: 2009.10.15-201664~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22bab3df7879bacfbc92440257760fd0fc0c4e6e;p=thirdparty%2Fopen-vm-tools.git Internal branch sync. Included in this change: . Changes in shared code that don't affect open-vm-tools functionality. . vmxnet3: free irqs & re-request them in suspend and resume respectively. Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c index 4bc94a21a..0987467f8 100644 --- a/open-vm-tools/lib/foundryMsg/foundryMsg.c +++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c @@ -437,7 +437,7 @@ static const VixCommandInfo vixCommandInfoTable[] = { VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_CHANGE_DISPLAY_TOPOLOGY_MODES, - VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), + VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), }; diff --git a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c index 5b3f810e7..b9b9bb679 100644 --- a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c +++ b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c @@ -4484,6 +4484,8 @@ vmxnet3_suspend(struct pci_dev *pdev, pm_message_t state) } vmxnet3_disable_all_intrs(adapter); + vmxnet3_free_irqs(adapter); + vmxnet3_free_intr_resources(adapter); netif_device_detach(netdev); netif_stop_queue(netdev); @@ -4614,6 +4616,8 @@ vmxnet3_resume(struct pci_dev *pdev) pci_enable_wake(pdev, PCI_D0, 0); VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_PMCFG); + vmxnet3_alloc_intr_resources(adapter); + vmxnet3_request_irqs(adapter); vmxnet3_enable_all_intrs(adapter); return 0; diff --git a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_version.h b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_version.h index 03b9dff64..37044fa7d 100644 --- a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_version.h +++ b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_version.h @@ -25,11 +25,11 @@ #ifndef _VMXNET3_VERSION_H_ #define _VMXNET3_VERSION_H_ -#define VMXNET3_DRIVER_VERSION 1.0.3.0 -#define VMXNET3_DRIVER_VERSION_COMMAS 1,0,3,0 -#define VMXNET3_DRIVER_VERSION_STRING "1.0.3.0" +#define VMXNET3_DRIVER_VERSION 1.0.4.0 +#define VMXNET3_DRIVER_VERSION_COMMAS 1,0,4,0 +#define VMXNET3_DRIVER_VERSION_STRING "1.0.4.0" /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ -#define VMXNET3_DRIVER_VERSION_NUM 0x01000300 +#define VMXNET3_DRIVER_VERSION_NUM 0x01000400 #endif /* _VMXNET3_VERSION_H_ */