From: VMware, Inc <> Date: Tue, 26 Apr 2011 20:41:12 +0000 (-0700) Subject: fix irq naming to match network convention X-Git-Tag: 2011.04.25-402641~58 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b3588ff3957bf3dedd27bf4e491b826262a30e0;p=thirdparty%2Fopen-vm-tools.git fix irq naming to match network convention The vmxnet driver always requests irq with name of 'vmxnet' which is incorrect. It causes multiple entries in /proc/interrupts and confuses scripts like irqbalance that try and manage smp affinity on network cards. The fix is simple, just use the standard convention of putting device name in the irq name. This applies to all kernel versions. Signed-off-by: Stephen Hemminger Signed-off-by: Shreyas N Bhatewara Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet.c b/open-vm-tools/modules/linux/vmxnet/vmxnet.c index 236103eeb..2de3e1bed 100644 --- a/open-vm-tools/modules/linux/vmxnet/vmxnet.c +++ b/open-vm-tools/modules/linux/vmxnet/vmxnet.c @@ -1915,7 +1915,7 @@ vmxnet_open(struct net_device *dev) } if (dev->irq == 0 || request_irq(dev->irq, &vmxnet_interrupt, - COMPAT_IRQF_SHARED, lp->name, (void *)dev)) { + COMPAT_IRQF_SHARED, dev->name, (void *)dev)) { return -EAGAIN; } diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h b/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h index be399ca70..522c46f8f 100644 --- a/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h +++ b/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h @@ -25,8 +25,8 @@ #ifndef _VMXNET_VERSION_H_ #define _VMXNET_VERSION_H_ -#define VMXNET_DRIVER_VERSION 2.0.8.0 -#define VMXNET_DRIVER_VERSION_COMMAS 2,0,8,0 -#define VMXNET_DRIVER_VERSION_STRING "2.0.8.0" +#define VMXNET_DRIVER_VERSION 2.0.9.0 +#define VMXNET_DRIVER_VERSION_COMMAS 2,0,9,0 +#define VMXNET_DRIVER_VERSION_STRING "2.0.9.0" #endif /* _VMXNET_VERSION_H_ */