diff options
| author | Dale Farnsworth <dale@farnsworth.org> | 2007-03-01 16:31:48 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 20:16:10 -0500 |
| commit | 5ada386bad58f023686b17113496ff626f10773f (patch) | |
| tree | 329a34f189f07987d5ec45c874ecb5d6f60b1259 /drivers/net | |
| parent | 471a567144b91c8f2b7a71a1cf8babe7331590b1 (diff) | |
| download | blackbird-op-linux-5ada386bad58f023686b17113496ff626f10773f.tar.gz blackbird-op-linux-5ada386bad58f023686b17113496ff626f10773f.zip | |
mv643xx_eth: move mac_addr inside mv643xx_eth_platform_data
The information contained within platform_data should be self-contained.
Replace the pointer to a MAC address with the actual MAC address in
struct mv643xx_eth_platform_data.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 3e045a695dbc..be2ddbb6ef56 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -1380,7 +1380,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) pd = pdev->dev.platform_data; if (pd) { - if (pd->mac_addr) + if (is_valid_ether_addr(pd->mac_addr)) memcpy(dev->dev_addr, pd->mac_addr, 6); if (pd->phy_addr || pd->force_phy_addr) |
