]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Allow changing vmxnet2's MAC address while the interface is up
authorVMware, Inc <>
Thu, 27 Oct 2011 18:20:15 +0000 (11:20 -0700)
committerMarcelo Vanzin <mvanzin@vmware.com>
Thu, 27 Oct 2011 18:20:15 +0000 (11:20 -0700)
There is nothing in the device backend which prohibits us from
changing the MAC address of the vmxnet2 vNIC while the interface
is up and running. This patch allows the same from guest driver.
Thus vmxnet2 is comparable to vmxnet3 and e1000 behavior in this
regard.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
open-vm-tools/modules/linux/vmxnet/vmxnet.c
open-vm-tools/modules/linux/vmxnet/vmxnet_version.h

index 6ba1149a6ea080ab5060ceca71cd8dd5753a97fe..a6f5740c5433ff7b62f219e26dd7d67125ad5a10 100644 (file)
@@ -3040,9 +3040,6 @@ vmxnet_set_mac_address(struct net_device *dev, void *p)
    unsigned int ioaddr = dev->base_addr;
    int i;
 
-   if (netif_running(dev))
-      return -EBUSY;
-
    memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
    for (i = 0; i < ETH_ALEN; i++) {
index 324dbb3f88aad4e75e346f1097f7a4de841541ff..bb0163e2faa48579122ae3f5821855d02671ac2b 100644 (file)
@@ -25,8 +25,8 @@
 #ifndef _VMXNET_VERSION_H_
 #define _VMXNET_VERSION_H_
 
-#define VMXNET_DRIVER_VERSION          2.0.10.0
-#define VMXNET_DRIVER_VERSION_COMMAS   2,0,10,0
-#define VMXNET_DRIVER_VERSION_STRING   "2.0.10.0"
+#define VMXNET_DRIVER_VERSION          2.0.11.0
+#define VMXNET_DRIVER_VERSION_COMMAS   2,0,11,0
+#define VMXNET_DRIVER_VERSION_STRING   "2.0.11.0"
 
 #endif /* _VMXNET_VERSION_H_ */