From 2e0b0f1f02415c349dfd5b25ce91bfe17860c5e3 Mon Sep 17 00:00:00 2001
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Date: Fri, 14 Jan 2011 14:59:31 +0000
Subject: [PATCH] --- yaml --- r: 231903 b: refs/heads/master c:
 f9f2502626133e33599578a16ed54435733f062c h: refs/heads/master i:   231901:
 28d86f4cb9c09b1be3c48cb78339f66a952581ab   231899:
 373fbc20c188aeb9487d1c84bb38d9ef481b06b3   231895:
 42266354a059f923f860b58d12f4f3fba687b2c2   231887:
 aa723730792166c52f51386bd9d6e6822f3737bc   231871:
 c7ab02b0bbf6669036068b70ac0984140c5f4839 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b46c05edc0d..e8e5f3cad2d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a53255d38e6d08453373ac0b7256d40395b202ba
+refs/heads/master: f9f2502626133e33599578a16ed54435733f062c
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index 562bdbb01507..89bcee8ee3d9 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -48,6 +48,9 @@ static atomic_t devices_found;
 static int enable_mq = 1;
 static int irq_share_mode;
 
+static void
+vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
+
 /*
  *    Enable/Disable the given intr
  */
@@ -2168,6 +2171,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
 	/* rx filter settings */
 	devRead->rxFilterConf.rxMode = 0;
 	vmxnet3_restore_vlan(adapter);
+	vmxnet3_write_mac_addr(adapter, adapter->netdev->dev_addr);
+
 	/* the rest are already zeroed */
 }