From 77829cda98df681b70214dd3230b05e526c3f2ad Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 20 Nov 2015 15:23:02 +0100
Subject: [PATCH] ar71xx: fix wndr3700_board_detect for some NETGEAR WNDR3700v2
 (again)

---
 ...ct-for-some-NETGEAR-WNDR3700v2-again.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 patches/openwrt/0040-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2-again.patch

diff --git a/patches/openwrt/0040-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2-again.patch b/patches/openwrt/0040-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2-again.patch
new file mode 100644
index 00000000..cc078e54
--- /dev/null
+++ b/patches/openwrt/0040-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2-again.patch
@@ -0,0 +1,46 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Fri, 20 Nov 2015 15:09:03 +0100
+Subject: ar71xx: fix wndr3700_board_detect for some NETGEAR WNDR3700v2 (again)
+
+When fixing the model string for WNDR3700v2 which contain a model string
+followed by 0xff in r46455, the match for other versions of the WNDR3700v2
+which just contain lots of 0xff broke (as the 0xff $model is checked for
+is stripped off).
+
+Fix by stripping off non-printable characters only for the actual output
+string, but not for the internal matching.
+
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index 388cf38..daebaa4 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -37,8 +37,9 @@ wndr3700_board_detect() {
+ 		machine="NETGEAR WNDR3700"
+ 		;;
+ 	"33373031")
+-		# Use awk to remove everything after the first zero byte
+-		model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
++		model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c)"
++		# Use awk to remove everything unprintable
++		model_stripped="$(echo -n "$model" | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
+ 		case $model in
+ 		$'\xff'*)
+ 			if [ "${model:24:1}" = 'N' ]; then
+@@ -48,14 +49,14 @@ wndr3700_board_detect() {
+ 			fi
+ 			;;
+ 		'29763654+16+64'*)
+-			machine="NETGEAR ${model:14}"
++			machine="NETGEAR ${model_stripped:14}"
+ 			;;
+ 		'29763654+16+128'*)
+-			machine="NETGEAR ${model:15}"
++			machine="NETGEAR ${model_stripped:15}"
+ 			;;
+ 		*)
+ 			# Unknown ID
+-			machine="NETGEAR $model"
++			machine="NETGEAR ${model_stripped}"
+ 		esac
+ 	esac
+