iwinfo: don't use the txpower value from debugfs for now, it does not match the value...

[librecmc/librecmc.git] / target / linux / brcm63xx / patches-3.3 / 304-boardid_fixup.patch

diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index f5615294340e159106fbcb17010f1fd316d652f3..c3dd8e9898f22104b428671ac1786d4ad0e8a3fe 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -1,10 +1,10 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -29,12 +29,16 @@
+@@ -28,12 +28,16 @@
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
-+#include <bcm_tag.h>
++#include <linux/bcm963xx_tag.h>
  
  #define PFX   "board_bcm963xx: "
  
@@ -17,7 +17,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -725,6 +729,29 @@ static int board_get_mac_address(u8 *mac
+@@ -724,6 +728,29 @@ static int board_get_mac_address(u8 *mac
        return 0;
  }
  
@@ -26,10 +26,10 @@
 +      struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
 +
 +      /* check if bcm_tag is at 64k offset */
-+      if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) {
++      if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
 +              /* else try 128k */
 +              tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
-+              if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) {
++              if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
 +                      /* No tag found */
 +                      printk(KERN_DEBUG "No bcm_tag found!\n");
 +                      return;
@@ -47,7 +47,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -766,6 +793,11 @@ void __init board_prom_init(void)
+@@ -771,6 +798,11 @@ void __init board_prom_init(void)
                return;
        }