aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/silan/sc92031.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-08 01:38:26 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-08 18:00:48 -0800
commitaaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc (patch)
treef6d51541dbee2d6e1810fd7b5e44d149b1a01750 /drivers/net/ethernet/silan/sc92031.c
parentnet: init perm_addr in register_netdevice() (diff)
downloadlinux-dev-aaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc.tar.xz
linux-dev-aaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc.zip
remove init of dev->perm_addr in drivers
perm_addr is initialized correctly in register_netdevice() so to init it in drivers is no longer needed. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/silan/sc92031.c')
-rw-r--r--drivers/net/ethernet/silan/sc92031.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index b2315324cc6d..28f7268f1b88 100644
--- a/drivers/net/ethernet/silan/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
@@ -1458,12 +1458,12 @@ static int sc92031_probe(struct pci_dev *pdev, const struct pci_device_id *id)
mac0 = ioread32(port_base + MAC0);
mac1 = ioread32(port_base + MAC0 + 4);
- dev->dev_addr[0] = dev->perm_addr[0] = mac0 >> 24;
- dev->dev_addr[1] = dev->perm_addr[1] = mac0 >> 16;
- dev->dev_addr[2] = dev->perm_addr[2] = mac0 >> 8;
- dev->dev_addr[3] = dev->perm_addr[3] = mac0;
- dev->dev_addr[4] = dev->perm_addr[4] = mac1 >> 8;
- dev->dev_addr[5] = dev->perm_addr[5] = mac1;
+ dev->dev_addr[0] = mac0 >> 24;
+ dev->dev_addr[1] = mac0 >> 16;
+ dev->dev_addr[2] = mac0 >> 8;
+ dev->dev_addr[3] = mac0;
+ dev->dev_addr[4] = mac1 >> 8;
+ dev->dev_addr[5] = mac1;
err = register_netdev(dev);
if (err < 0)