Skip to content

Commit

Permalink
mv643xx_eth: Fix use of uninitialized port_num field
Browse files Browse the repository at this point in the history
In this driver, the default ethernet address is first set by by calling
eth_port_uc_addr_get() which reads the relevant registers of the
corresponding port as initially set by firmware. However that function
used the port_num field accessed through the private area of net_dev
before it was set.

The result was that one board I have ended up with the unicast address
set to 00:00:00:00:00:00 (only port 1 is connected on this board). The
problem appeared after commit 84dd619.

This patch fixes the bug by setting mp->port_num prior to calling
eth_port_uc_get_addr().

Signed-off-by: Gabriel Paubert <paubert@iram.es>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Gabriel Paubert authored and Jeff Garzik committed Mar 28, 2007
1 parent 3ba4d09 commit fadac40
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/mv643xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)

spin_lock_init(&mp->lock);

port_num = pd->port_number;
port_num = mp->port_num = pd->port_number;

/* set default config values */
eth_port_uc_addr_get(dev, dev->dev_addr);
Expand Down Expand Up @@ -1411,8 +1411,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
duplex = pd->duplex;
speed = pd->speed;

mp->port_num = port_num;

/* Hook up MII support for ethtool */
mp->mii.dev = dev;
mp->mii.mdio_read = mv643xx_mdio_read;
Expand Down

0 comments on commit fadac40

Please sign in to comment.