diff options
| author | Shreyas Bhatewara <sbhatewara@vmware.com> | 2011-01-14 14:59:31 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-15 21:21:11 -0800 |
| commit | f9f2502626133e33599578a16ed54435733f062c (patch) | |
| tree | dc0d1879d4f7a1a4fc7c9659e2c95d71fc7272b7 /drivers/net/vmxnet3 | |
| parent | a53255d38e6d08453373ac0b7256d40395b202ba (diff) | |
| download | linux-f9f2502626133e33599578a16ed54435733f062c.tar.bz2 | |
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/vmxnet3')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 5 |
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; 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 */ } |