From c9954c5cb247c0fdde21d8ff3f2aef5f41dfe89e Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Sun, 14 Aug 2011 13:17:23 +0300
Subject: [PATCH] --- yaml --- r: 265805 b: refs/heads/master c:
 b67476ef1a6417b92d3bb52510ceee266cd9ea1e h: refs/heads/master i:   265803:
 596c8ffd0c48635ce06b121aaa3e8bdc063ec867 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/cmd.c  | 6 +++---
 trunk/drivers/net/wireless/wl12xx/cmd.h  | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 69e54826c131..a0752c7744a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f9c8250e10a16f48f82ffda3a5a7cb9e7b4a9ee
+refs/heads/master: b67476ef1a6417b92d3bb52510ceee266cd9ea1e
diff --git a/trunk/drivers/net/wireless/wl12xx/cmd.c b/trunk/drivers/net/wireless/wl12xx/cmd.c
index 025fb14184d6..d655e629677c 100644
--- a/trunk/drivers/net/wireless/wl12xx/cmd.c
+++ b/trunk/drivers/net/wireless/wl12xx/cmd.c
@@ -1321,12 +1321,12 @@ int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
 	return ret;
 }
 
-int wl12xx_cmd_set_peer_state(struct wl1271 *wl)
+int wl12xx_cmd_set_peer_state(struct wl1271 *wl, u8 hlid)
 {
 	struct wl12xx_cmd_set_peer_state *cmd;
 	int ret = 0;
 
-	wl1271_debug(DEBUG_CMD, "cmd set peer state (hlid=%d)", wl->sta_hlid);
+	wl1271_debug(DEBUG_CMD, "cmd set peer state (hlid=%d)", hlid);
 
 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
 	if (!cmd) {
@@ -1334,7 +1334,7 @@ int wl12xx_cmd_set_peer_state(struct wl1271 *wl)
 		goto out;
 	}
 
-	cmd->hlid = wl->sta_hlid;
+	cmd->hlid = hlid;
 	cmd->state = WL1271_CMD_STA_STATE_CONNECTED;
 
 	ret = wl1271_cmd_send(wl, CMD_SET_PEER_STATE, cmd, sizeof(*cmd), 0);
diff --git a/trunk/drivers/net/wireless/wl12xx/cmd.h b/trunk/drivers/net/wireless/wl12xx/cmd.h
index 8b32a57e1cc6..740d27edd02d 100644
--- a/trunk/drivers/net/wireless/wl12xx/cmd.h
+++ b/trunk/drivers/net/wireless/wl12xx/cmd.h
@@ -70,7 +70,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
 int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
 			  u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,
 			  u16 tx_seq_16);
-int wl12xx_cmd_set_peer_state(struct wl1271 *wl);
+int wl12xx_cmd_set_peer_state(struct wl1271 *wl, u8 hlid);
 int wl12xx_roc(struct wl1271 *wl, u8 role_id);
 int wl12xx_croc(struct wl1271 *wl, u8 role_id);
 int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid);
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 934f5731fd73..27333d1afd0d 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -395,7 +395,7 @@ static int wl1271_check_operstate(struct wl1271 *wl, unsigned char operstate)
 	if (test_and_set_bit(WL1271_FLAG_STA_STATE_SENT, &wl->flags))
 		return 0;
 
-	ret = wl12xx_cmd_set_peer_state(wl);
+	ret = wl12xx_cmd_set_peer_state(wl, wl->sta_hlid);
 	if (ret < 0)
 		return ret;
 
@@ -3676,6 +3676,10 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,
 	if (ret < 0)
 		goto out_sleep;
 
+	ret = wl12xx_cmd_set_peer_state(wl, hlid);
+	if (ret < 0)
+		goto out_sleep;
+
 out_sleep:
 	wl1271_ps_elp_sleep(wl);