aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/et131x/et131x_netdev.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-06 15:47:41 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:06 -0800
commitc431e3c06424499c24378fda546827b7caa79800 (patch)
tree50b9bb570bb44bfea00b415a821e26161c03a78c /drivers/staging/et131x/et131x_netdev.c
parent7f2bf9488db14c67778cee6b5204ecf3629e1ec2 (diff)
Staging: et131x: tidy up initpci code
Perform some easy tidying so we can see what needs to be done next Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_netdev.c')
-rw-r--r--drivers/staging/et131x/et131x_netdev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index 8c7612f63f9..8d84286fb6b 100644
--- a/drivers/staging/et131x/et131x_netdev.c
+++ b/drivers/staging/et131x/et131x_netdev.c
@@ -622,7 +622,7 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu)
et131x_init_send(adapter);
- et131x_setup_hardware_properties(adapter);
+ et131x_hwaddr_init(adapter);
memcpy(netdev->dev_addr, adapter->CurrentAddress, ETH_ALEN);
/* Init the device with the new settings */
@@ -709,9 +709,7 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
et131x_init_send(adapter);
- et131x_setup_hardware_properties(adapter);
- /* memcpy( netdev->dev_addr, adapter->CurrentAddress, ETH_ALEN ); */
- /* blux: no, do not override our nice address */
+ et131x_hwaddr_init(adapter);
/* Init the device with the new settings */
et131x_adapter_setup(adapter);