From d1d5741d8568c268ec234a5b35af4a04498be6d8 Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Mon, 9 Jun 2008 16:33:57 -0700 Subject: macb: use random mac if stored address in EEPROM is invalid We should use a random mac address if the EEPROM doesn't contain a valid one. This makes life on Boards with unprogrammed EEPROM devices easier. Signed-off-by: Sven Schnelle Cc: Haavard Skinnemoen Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- drivers/net/macb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'drivers/net/macb.c') diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 92dccd43bdc..e34630252ce 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -80,8 +80,12 @@ static void __init macb_get_hwaddr(struct macb *bp) addr[4] = top & 0xff; addr[5] = (top >> 8) & 0xff; - if (is_valid_ether_addr(addr)) + if (is_valid_ether_addr(addr)) { memcpy(bp->dev->dev_addr, addr, sizeof(addr)); + } else { + dev_info(&bp->pdev->dev, "invalid hw address, using random\n"); + random_ether_addr(bp->dev->dev_addr); + } } static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum) -- cgit v1.2.3 From 263ba3204a434d0ca851e1321b31cd58376b86cb Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 15 Jul 2008 03:47:41 -0700 Subject: netdev: Convert all drivers away from netif_schedule(). They logically all want to trigger a schedule for all device TX queues. Signed-off-by: David S. Miller --- drivers/net/macb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/macb.c') diff --git a/drivers/net/macb.c b/drivers/net/macb.c index e34630252ce..50688a52658 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -165,7 +165,7 @@ static void macb_handle_link_change(struct net_device *dev) if (phydev->link != bp->link) { if (phydev->link) - netif_schedule(dev); + netif_tx_schedule_all(dev); else { bp->speed = 0; bp->duplex = -1; -- cgit v1.2.3