diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-04-25 10:24:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-25 10:24:10 +0000 |
| commit | 9e8e64d9713add649f254706e3da09ef4c235993 (patch) | |
| tree | d123746f3863b76f57174cab4cf773b91b02f46a | |
| parent | 3dc39676503352ebbab0b64d50495485353d2de1 (diff) | |
| parent | 0f32d2861643a39a2fca2e9c4505a2183ecf41d1 (diff) | |
merge of 2e72ff814146cd6f8905742854f09312f89f7f5e
and 7bea148102c0724aff0e6a3c580de23677685c48
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch | 11 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch | 11 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.16.bb | 2 |
3 files changed, 11 insertions, 13 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; diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index 0b00414577..5d02946842 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r5.${PR_CONFIG}" +PR = "r6.${PR_CONFIG}" include ixp4xx-kernel.inc |