---

yaml --- r: 231903 b: refs/heads/master c: f9f2502 h: refs/heads/master i: 231901: 28d86f4 231899: 373fbc2 231895: 4226635 231887: aa72373 231871: c7ab02b v: v3
git-mirror · Jan 16, 2011 · 2e0b0f1 · 2e0b0f1
1 parent a3c4b4f
commit 2e0b0f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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 */
 }