mwifiex: correct aid value during tdls setup

BugLink: http://bugs.launchpad.net/bugs/1638267
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index cc09a81dbf6a8eac3f4b4ac8ee84839bcbafe811..de53c6fec3bd8cc92b377796019dc52869214191 100644 (file)
--- 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 mwifiex_private *priv,
        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++;