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 <shemminger@vyatta.com>
Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet.c b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
index 236103eebdcd9e44277791cf75ad25823952447c..2de3e1bed6baea304edafd82bab6038d01097d81 100644 (file)
--- 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 be399ca70328123daefd019d3fd50089fc7f5084..522c46f8f58f49a5135513508466d32d7ae192a2 100644 (file)
--- 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_ */