The patch titled
sis900: generate fake MAC address if the hardware doesn't have one
has been removed from the -mm tree. Its filename was
sis900-generate-fake-mac-address-if-the-hardware-doesnt-have-one.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sis900: generate fake MAC address if the hardware doesn't have one
From: Daniele Venzano <venza@xxxxxxxxxxxx>
Modify the sis900 driver when the MAC address read from the hardware is
invalid. As suggested, the patch now generates a random address so that
the user can go on and use the hardware. In any case a message is also
shown to warn on the unexpected condition.
This seems to happen with newer HW implementation of the sis900 chipset,
since this never came up before.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10201
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11649
Signed-off-by: Daniele Venzano <venza@xxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/sis900.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/net/sis900.c~sis900-generate-fake-mac-address-if-the-hardware-doesnt-have-one drivers/net/sis900.c
--- a/drivers/net/sis900.c~sis900-generate-fake-mac-address-if-the-hardware-doesnt-have-one
+++ a/drivers/net/sis900.c
@@ -509,10 +509,10 @@ static int __devinit sis900_probe(struct
else
ret = sis900_get_mac_addr(pci_dev, net_dev);
- if (ret == 0) {
- printk(KERN_WARNING "%s: Cannot read MAC address.\n", dev_name);
- ret = -ENODEV;
- goto err_unmap_rx;
+ if (!ret || !is_valid_ether_addr(net_dev->dev_addr)) {
+ random_ether_addr(net_dev->dev_addr);
+ printk(KERN_WARNING "%s: Unreadable or invalid MAC address,"
+ "using random generated one\n", dev_name);
}
/* 630ET : set the mii access mode as software-mode */
_
Patches currently in -mm which might be from venza@xxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
