aboutsummaryrefslogtreecommitdiffstats
path: root/packages/linux/ixp4xx-kernel
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-04-14 18:11:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-14 18:11:50 +0000
commit31762cbb93b21d368a67737b4d647d6b4ba3dcfb (patch)
treee714311abc65a2872cf3a79c1465420af6b87057 /packages/linux/ixp4xx-kernel
parente8cd328180f9105b8b6ebe9598ef2a80a76d9b0c (diff)
downloadopenembedded-31762cbb93b21d368a67737b4d647d6b4ba3dcfb.tar.gz
ixp4xx-kernel: Updated the nslu2 and nas100d mac address patches to print the new mac address after the ethernet module is loaded.
Diffstat (limited to 'packages/linux/ixp4xx-kernel')
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch11
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch11
2 files changed, 10 insertions, 12 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch b/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch
index 59715a024e..c3d919569b 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch
@@ -13,7 +13,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-@@ -110,8 +113,69 @@ static void nas100d_power_off(void)
+@@ -110,8 +113,68 @@ static void nas100d_power_off(void)
gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH);
}
@@ -31,11 +31,6 @@
+ err = mtd->read(mtd, 0x0FD8, 6, &retlen, (u8 *) &mac.sa_data);
+ if (err != 0 || retlen != 6)
+ printk(KERN_ERR "nas100d: mac addr read failed\n");
-+ else
-+ printk(KERN_INFO
-+ "nas100d: mac %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-+ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2],
-+ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]);
+ }
+}
+
@@ -63,6 +58,10 @@
+ if (event == NETDEV_REGISTER && is_valid_ether_addr(mac.sa_data)) {
+ mac.sa_family = dev->type;
+ dev_set_mac_address(dev, &mac);
++ printk(KERN_INFO
++ "ixp400_eth: MAC address now set to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x for port 0\n",
++ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2],
++ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]);
+ }
+
+ return NOTIFY_DONE;
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch
index d1e84e222c..e96c5f9e75 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch
@@ -13,7 +13,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-@@ -117,6 +120,59 @@ static void nslu2_power_off(void)
+@@ -117,6 +120,58 @@ static void nslu2_power_off(void)
gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
}
@@ -31,11 +31,6 @@
+ err = mtd->read(mtd, 0x3FFB0, 6, &retlen, (u8 *) &mac.sa_data);
+ if (err != 0 || retlen != 6)
+ printk(KERN_ERR "nslu2: mac addr read failed\n");
-+ else
-+ printk(KERN_INFO
-+ "nslu2: mac %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-+ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2],
-+ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]);
+ }
+}
+
@@ -61,6 +56,10 @@
+ if (event == NETDEV_REGISTER && is_valid_ether_addr(mac.sa_data)) {
+ mac.sa_family = dev->type;
+ dev_set_mac_address(dev, &mac);
++ printk(KERN_INFO
++ "ixp400_eth: MAC address now set to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x for port 0\n",
++ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2],
++ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]);
+ }
+
+ return NOTIFY_DONE;