diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-01-08 01:38:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-08 18:00:48 -0800 |
| commit | aaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc (patch) | |
| tree | f6d51541dbee2d6e1810fd7b5e44d149b1a01750 /drivers/net/ethernet/marvell | |
| parent | 948b337e62ca96b6e7de06fdd5f6fe44769d7e9c (diff) | |
| download | blackbird-op-linux-aaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc.tar.gz blackbird-op-linux-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/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/skge.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index 5544a1fe2f94..8b08bc4b8a76 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -3855,7 +3855,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, /* read the mac address */ memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN); - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); return dev; } diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 3269eb38cc57..366a12aa3c74 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4801,7 +4801,6 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, /* read the mac address */ memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); - memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); return dev; } |
