From debd40f9d72128f30c637cfeefb0fb9e3bf52524 Mon Sep 17 00:00:00 2001
From: havok87 <andre.sookram@gmail.com>
Date: Thu, 19 Jun 2014 20:38:04 -0400
Subject: [PATCH] flo: merge tag 'android-4.4.4_r1'

Conflicts:
	WCNSS_qcom_cfg.ini

Change-Id: I2d69ec81ac71a8b67e731eb8e348618d971613e5
---
 WCNSS_cfg.dat                                 | Bin 10330 -> 10394 bytes
 WCNSS_qcom_cfg.ini                            |   3 +++
 .../generate-factory-images-package.sh        |   6 +++---
 self-extractors/generate-packages.sh          |   6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WCNSS_cfg.dat b/WCNSS_cfg.dat
index a5ee46c6abd0c1a78b833e72b479fade60a4f88a..16ba06f087a4ce2d0a0ee50f54e3f3db56d3fc13 100644
GIT binary patch
delta 164
zcmcZ=Fe}iMk%yU^k%5VEmIea@69WSS3lIaD3?d>746H!f21v&M@%w!csKdy>@M@#!
zdKT6f1^g^8H$P-q%*+ZDW3buW$g!At@&PuE%_=+#U}6XPlUZ0ndfso=6ai{_3)J*(
h^HquMPz93@vWahAAhQ6X(LrGgOyfu8bQY%73jwQmE35zj

delta 147
zcmbOgcq_n^k%yU^k%5UZN`rxciGhKE1&D!6hA+Yl46Hy}MudUE28iG9gFr1t28I_K
zP1mz*e#5eWdGb?PfyozSj%;2a>%cfUKtX1cd;#O+8ijz#4LmHHC-C?%Z+^m`z`_dB
o^>(wT$a<Ddl3PH!gg2j;S;#zj0xQer8iftan@v<wSeOjU0YqyoCjbBd

diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 4ce1da3..aa7e616 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -247,5 +247,8 @@ gTDLSRSSITriggerThreshold=-60
 gTDLSIdlePacketThreshold=5
 gTDLSRSSITeardownThreshold=-70
 
+# Enable IPv6 RA filtering
+gMCAddrListEnable=1
+
 END
 # Note: Configuration parser would not read anything past the END marker
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index 0830600..b4d9180 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -25,10 +25,10 @@
 # end jb-mr2-dev
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=748593
+BUILD=937116
 DEVICE=flo
 PRODUCT=razor
-VERSION=jss15j
+VERSION=kot49h
 SRCPREFIX=signed-
-BOOTLOADER=flo-03.14
+BOOTLOADER=flo-04.02
 source ../../../common/generate-factory-images-common.sh
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 05cbf15..bb1a80a 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -33,9 +33,9 @@
 BRANCH=klp-dev
 if test $BRANCH = klp-dev
 then
-  ZIP=razor-ota-748593
-  BUILD=jss15j
-fi # jb-mr2-dev
+  ZIP=razor-ota-937116
+  BUILD=kot49h
+fi # klp-dev
 ROOTDEVICE=flo
 DEVICE=flo
 MANUFACTURER=asus