[ixp4xx] fixup cambria/avila model detection

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19448 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
index 2ec8b5e..6753451 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
@@ -398,6 +398,7 @@
 +static struct cambria_board_info * __init cambria_find_board_info(char *model)
 +{
 +      int i;
 +static struct cambria_board_info * __init cambria_find_board_info(char *model)
 +{
 +      int i;

++      model[6] = '\0';

 +
 +      for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) {
 +              struct cambria_board_info *info = &cambria_boards[i];
 +
 +      for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) {
 +              struct cambria_board_info *info = &cambria_boards[i];


@@ -413,7 +414,7 @@
 +static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +      char mac_addr[ETH_ALEN];
 +static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +      char mac_addr[ETH_ALEN];

-+      char model[6];
++      char model[7];

 +
 +      at24_mem_acc = mem_acc;
 +
 +
 +      at24_mem_acc = mem_acc;
 +


@@ -421,7 +422,6 @@
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +              memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +              memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +      }

-+

 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +              memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +              memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
 +      }

diff --git a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
index c298834..d3ccb04 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
@@ -147,6 +147,7 @@
 +static struct avila_board_info * __init avila_find_board_info(char *model)
 +{
 +      int i;
 +static struct avila_board_info * __init avila_find_board_info(char *model)
 +{
 +      int i;

++      model[6] = '\0';

 +
 +      for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
 +              struct avila_board_info *info = &avila_boards[i];
 +
 +      for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
 +              struct avila_board_info *info = &avila_boards[i];


@@ -162,7 +163,7 @@
 +static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +      char mac_addr[ETH_ALEN];
 +static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +      char mac_addr[ETH_ALEN];

-+      char model[6];
++      char model[7];

 +
 +      at24_mem_acc = mem_acc;
 +
 +
 +      at24_mem_acc = mem_acc;
 +


@@ -170,7 +171,6 @@
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +              memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +              memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
 +      }

-+

 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +              memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +              memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +      }