openwrtv3/target/linux/brcm47xx/patches-3.3/194-MIPS-BCM47XX-read-sprom-without-prefix-if-no-ieee802.patch

--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -206,6 +206,8 @@ static int bcm47xx_get_sprom_bcma(struct
 			snprintf(prefix, sizeof(prefix), "sb/%u/",
 				 core->core_index);
 			bcm47xx_fill_sprom(out, prefix);
+		} else {
+			bcm47xx_fill_sprom(out, NULL);
 		}
 		return 0;
 	default:
Fix reading sprom from nvram without a prefix The bcma based SoCs with a ieee80211 core on the SoC and an other connected via PCIe or USB store the sprom for the SoC with a sb/1/ prefix. The SoC with just one wifi core do not use prefixes. The BCM4706 do not use a prefix for the SoC part at all, because the prefix is the path to the ieee80211 core and there is non on the BCM4706. SVN-Revision: 33597 2012-09-30 11:43:13 +00:00			`--- a/arch/mips/bcm47xx/setup.c`
			`+++ b/arch/mips/bcm47xx/setup.c`
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing * update the flash driver for bcm47xx to use the stubs already in bcma * do some misc enhancements to the flash drivers for bcm47xx SVN-Revision: 33920 2012-10-25 14:33:47 +00:00			`@@ -206,6 +206,8 @@ static int bcm47xx_get_sprom_bcma(struct`
Fix reading sprom from nvram without a prefix The bcma based SoCs with a ieee80211 core on the SoC and an other connected via PCIe or USB store the sprom for the SoC with a sb/1/ prefix. The SoC with just one wifi core do not use prefixes. The BCM4706 do not use a prefix for the SoC part at all, because the prefix is the path to the ieee80211 core and there is non on the BCM4706. SVN-Revision: 33597 2012-09-30 11:43:13 +00:00			`snprintf(prefix, sizeof(prefix), "sb/%u/",`
			`core->core_index);`
			`bcm47xx_fill_sprom(out, prefix);`
			`+ } else {`
			`+ bcm47xx_fill_sprom(out, NULL);`
			`}`
			`return 0;`
			`default:`