Commit f9f25026 authored by Shreyas Bhatewara's avatar Shreyas Bhatewara Committed by David S. Miller

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: default avatarShreyas N Bhatewara <sbhatewara@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a53255d3
...@@ -48,6 +48,9 @@ static atomic_t devices_found; ...@@ -48,6 +48,9 @@ static atomic_t devices_found;
static int enable_mq = 1; static int enable_mq = 1;
static int irq_share_mode; static int irq_share_mode;
static void
vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
/* /*
* Enable/Disable the given intr * Enable/Disable the given intr
*/ */
...@@ -2168,6 +2171,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter) ...@@ -2168,6 +2171,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
/* rx filter settings */ /* rx filter settings */
devRead->rxFilterConf.rxMode = 0; devRead->rxFilterConf.rxMode = 0;
vmxnet3_restore_vlan(adapter); vmxnet3_restore_vlan(adapter);
vmxnet3_write_mac_addr(adapter, adapter->netdev->dev_addr);
/* the rest are already zeroed */ /* the rest are already zeroed */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment