aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorShreyas Bhatewara <sbhatewara@vmware.com>2011-01-14 09:59:31 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-16 00:21:11 -0500
commitf9f2502626133e33599578a16ed54435733f062c (patch)
treedc0d1879d4f7a1a4fc7c9659e2c95d71fc7272b7 /drivers/net
parenta53255d38e6d08453373ac0b7256d40395b202ba (diff)
vmxnet3: Preserve the MAC address configured by ifconfig
While activating the device get it's MAC address from netdev. This will allow the MAC address configured using ifconfig to persist through the reset. Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 562bdbb01507..89bcee8ee3d9 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -48,6 +48,9 @@ static atomic_t devices_found;
48static int enable_mq = 1; 48static int enable_mq = 1;
49static int irq_share_mode; 49static int irq_share_mode;
50 50
51static void
52vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
53
51/* 54/*
52 * Enable/Disable the given intr 55 * Enable/Disable the given intr
53 */ 56 */
@@ -2168,6 +2171,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
2168 /* rx filter settings */ 2171 /* rx filter settings */
2169 devRead->rxFilterConf.rxMode = 0; 2172 devRead->rxFilterConf.rxMode = 0;
2170 vmxnet3_restore_vlan(adapter); 2173 vmxnet3_restore_vlan(adapter);
2174 vmxnet3_write_mac_addr(adapter, adapter->netdev->dev_addr);
2175
2171 /* the rest are already zeroed */ 2176 /* the rest are already zeroed */
2172} 2177}
2173 2178