diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-07 12:54:23 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-07 12:54:23 +0000 |
| commit | dc4363da2f85eafea2d7eeba7f13f94cdff12556 (patch) | |
| tree | 4a80bac0ec92271c069ffa9997365f56e1550a7e /target/linux/brcm47xx/patches-3.18/031-02-MIPS-BCM47XX-Fix-detecting-Microsoft-MN-700-Asus-WL5.patch | |
| parent | b5f93e8c0a9ab2d1580a5fdb37ae37492f84b853 (diff) | |
| download | master-187ad058-dc4363da2f85eafea2d7eeba7f13f94cdff12556.tar.gz master-187ad058-dc4363da2f85eafea2d7eeba7f13f94cdff12556.tar.bz2 master-187ad058-dc4363da2f85eafea2d7eeba7f13f94cdff12556.zip | |
brcm47xx: backport MIPS BCM47XX patches queued for 4.1
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45288 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/031-02-MIPS-BCM47XX-Fix-detecting-Microsoft-MN-700-Asus-WL5.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/031-02-MIPS-BCM47XX-Fix-detecting-Microsoft-MN-700-Asus-WL5.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/031-02-MIPS-BCM47XX-Fix-detecting-Microsoft-MN-700-Asus-WL5.patch b/target/linux/brcm47xx/patches-3.18/031-02-MIPS-BCM47XX-Fix-detecting-Microsoft-MN-700-Asus-WL5.patch new file mode 100644 index 0000000000..25125af197 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.18/031-02-MIPS-BCM47XX-Fix-detecting-Microsoft-MN-700-Asus-WL5.patch @@ -0,0 +1,38 @@ +From e0c3678ae640db049f738f30b5f23cde740799ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Wed, 1 Apr 2015 16:01:02 +0200 +Subject: [PATCH] MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since the day of adding this code it was broken. We were iterating over +a wrong array and checking for wrong NVRAM entry. + +Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +Cc: linux-mips@linux-mips.org +Cc: Hauke Mehrtens <hauke@hauke-m.de> +Patchwork: https://patchwork.linux-mips.org/patch/9654/ +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +--- + arch/mips/bcm47xx/board.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c +index b3ae068..3fd369d 100644 +--- a/arch/mips/bcm47xx/board.c ++++ b/arch/mips/bcm47xx/board.c +@@ -247,8 +247,8 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void) + } + + if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 && +- bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) { +- for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) { ++ bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0) { ++ for (e2 = bcm47xx_board_list_hw_version_num; e2->value1; e2++) { + if (!strstarts(buf1, e2->value1) && + !strcmp(buf2, e2->value2)) + return &e2->board; +-- +1.8.4.5 + |