ar71xx: fix RB-450G board detection (closes: #6453)

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

diff --git a/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch
index 62903c8..7864621 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch
@@ -15,7 +15,7 @@
  
  char *mips_machine_name = "Unknown";
  
-@@ -55,20 +56,64 @@ void __init mips_machine_set_name(char *
+@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
        }
  }
  
@@ -62,9 +62,10 @@
 +
 +      list_for_each(this, &mips_machines) {
 +              mach = list_entry(this, struct mips_machine, list);
-+              if (strncmp(mach->mach_id, mips_machid,
-+                          strlen(mips_machid)) == 0
-+              ) {
++              if (mach->mach_id == NULL)
++                      continue;
++
++              if (strcmp(mach->mach_id, mips_machid) == 0) {
 +                      mips_machtype = mach->mach_type;
 +                      return 0;
 +              }
@@ -78,7 +79,7 @@
 +      list_for_each(this, &mips_machines) {
 +              mach = list_entry(this, struct mips_machine, list);
 +              printk(KERN_WARNING "%32s %s\n",
-+                     mach->mach_id, mach->mach_name);
++                     mach->mach_id ? mach->mach_id : "", mach->mach_name);
 +      }
 +
 +      return 0;

diff --git a/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch
index 62903c8..7864621 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch
@@ -15,7 +15,7 @@
  
  char *mips_machine_name = "Unknown";
  
-@@ -55,20 +56,64 @@ void __init mips_machine_set_name(char *
+@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
        }
  }
  
@@ -62,9 +62,10 @@
 +
 +      list_for_each(this, &mips_machines) {
 +              mach = list_entry(this, struct mips_machine, list);
-+              if (strncmp(mach->mach_id, mips_machid,
-+                          strlen(mips_machid)) == 0
-+              ) {
++              if (mach->mach_id == NULL)
++                      continue;
++
++              if (strcmp(mach->mach_id, mips_machid) == 0) {
 +                      mips_machtype = mach->mach_type;
 +                      return 0;
 +              }
@@ -78,7 +79,7 @@
 +      list_for_each(this, &mips_machines) {
 +              mach = list_entry(this, struct mips_machine, list);
 +              printk(KERN_WARNING "%32s %s\n",
-+                     mach->mach_id, mach->mach_name);
++                     mach->mach_id ? mach->mach_id : "", mach->mach_name);
 +      }
 +
 +      return 0;

diff --git a/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
index 62903c8..7864621 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
@@ -15,7 +15,7 @@
  
  char *mips_machine_name = "Unknown";
  
-@@ -55,20 +56,64 @@ void __init mips_machine_set_name(char *
+@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
        }
  }
  
@@ -62,9 +62,10 @@
 +
 +      list_for_each(this, &mips_machines) {
 +              mach = list_entry(this, struct mips_machine, list);
-+              if (strncmp(mach->mach_id, mips_machid,
-+                          strlen(mips_machid)) == 0
-+              ) {
++              if (mach->mach_id == NULL)
++                      continue;
++
++              if (strcmp(mach->mach_id, mips_machid) == 0) {
 +                      mips_machtype = mach->mach_type;
 +                      return 0;
 +              }
@@ -78,7 +79,7 @@
 +      list_for_each(this, &mips_machines) {
 +              mach = list_entry(this, struct mips_machine, list);
 +              printk(KERN_WARNING "%32s %s\n",
-+                     mach->mach_id, mach->mach_name);
++                     mach->mach_id ? mach->mach_id : "", mach->mach_name);
 +      }
 +
 +      return 0;