From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 28 Oct 2016 17:42:21 +0000 (-0400)
Subject: 4.4-stable patches
X-Git-Tag: v4.4.29~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4013649acd65bc2bde2bfb0ca899e39167bc86c3;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	mwifiex-correct-aid-value-during-tdls-setup.patch
---

diff --git a/queue-4.4/mwifiex-correct-aid-value-during-tdls-setup.patch b/queue-4.4/mwifiex-correct-aid-value-during-tdls-setup.patch
new file mode 100644
index 00000000000..8b5c87a958a
--- /dev/null
+++ b/queue-4.4/mwifiex-correct-aid-value-during-tdls-setup.patch
@@ -0,0 +1,36 @@
+From b64db1b252e9974a43a51ba083fa7d03e4716167 Mon Sep 17 00:00:00 2001
+From: Xinming Hu <huxm@marvell.com>
+Date: Tue, 9 Aug 2016 20:20:44 +0530
+Subject: mwifiex: correct aid value during tdls setup
+
+From: Xinming Hu <huxm@marvell.com>
+
+commit b64db1b252e9974a43a51ba083fa7d03e4716167 upstream.
+
+AID gets updated during TDLS setup, but modified value isn't reflected
+in "priv->assoc_rsp_buf". This causes TDLS setup failure. The problem is
+fixed here.
+
+Fixes: 4aff53ef18e4a4 ("mwifiex: parsing aid while receiving..")
+Signed-off-by: Xinming Hu <huxm@marvell.com>
+Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/mwifiex/join.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/mwifiex/join.c
++++ b/drivers/net/wireless/mwifiex/join.c
+@@ -661,9 +661,8 @@ int mwifiex_ret_802_11_associate(struct
+ 	priv->assoc_rsp_size = min(le16_to_cpu(resp->size) - S_DS_GEN,
+ 				   sizeof(priv->assoc_rsp_buf));
+ 
+-	memcpy(priv->assoc_rsp_buf, &resp->params, priv->assoc_rsp_size);
+-
+ 	assoc_rsp->a_id = cpu_to_le16(aid);
++	memcpy(priv->assoc_rsp_buf, &resp->params, priv->assoc_rsp_size);
+ 
+ 	if (status_code) {
+ 		priv->adapter->dbg.num_cmd_assoc_failure++;
diff --git a/queue-4.4/series b/queue-4.4/series
index 76f2457e8a4..3f83ce7d3a3 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -26,3 +26,4 @@ genirq-generic_chip-add-irq_unmap-callback.patch
 uio-fix-dmem_region_start-computation.patch
 arm-clk-imx35-fix-name-for-ckil-clk.patch
 spi-spi-fsl-dspi-drop-extra-spi_master_put-in-device-remove-function.patch
+mwifiex-correct-aid-value-during-tdls-setup.patch