From: Arik Nemtsov <arik@wizery.com>
To: <linux-wireless@vger.kernel.org>
Cc: Luciano Coelho <coelho@ti.com>,
Johannes Berg <johannes@sipsolutions.net>,
Arik Nemtsov <arik@wizery.com>
Subject: [PATCH v2 08/10] wl12xx: AP mode - fix bug in cleanup of wl1271_op_sta_add()
Date: Mon, 31 Jan 2011 13:16:27 +0200 [thread overview]
Message-ID: <1296472589-26401-9-git-send-email-arik@wizery.com> (raw)
In-Reply-To: <1296472589-26401-1-git-send-email-arik@wizery.com>
Remove an active hlid when chip wakeup fails. In addition rename the
involved functions.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
drivers/net/wireless/wl12xx/main.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 8d55c89..46eb499 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2621,7 +2621,7 @@ static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,
return 0;
}
-static int wl1271_allocate_hlid(struct wl1271 *wl,
+static int wl1271_allocate_sta(struct wl1271 *wl,
struct ieee80211_sta *sta,
u8 *hlid)
{
@@ -2642,10 +2642,13 @@ static int wl1271_allocate_hlid(struct wl1271 *wl,
return 0;
}
-static void wl1271_free_hlid(struct wl1271 *wl, u8 hlid)
+static void wl1271_free_sta(struct wl1271 *wl, u8 hlid)
{
int id = hlid - WL1271_AP_STA_HLID_START;
+ if (WARN_ON(!test_bit(id, wl->ap_hlid_map)))
+ return;
+
__clear_bit(id, wl->ap_hlid_map);
wl1271_tx_reset_link_queues(wl, hlid);
}
@@ -2668,13 +2671,13 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,
wl1271_debug(DEBUG_MAC80211, "mac80211 add sta %d", (int)sta->aid);
- ret = wl1271_allocate_hlid(wl, sta, &hlid);
+ ret = wl1271_allocate_sta(wl, sta, &hlid);
if (ret < 0)
goto out;
ret = wl1271_ps_elp_wakeup(wl, false);
if (ret < 0)
- goto out;
+ goto out_free_sta;
ret = wl1271_cmd_add_sta(wl, sta, hlid);
if (ret < 0)
@@ -2683,6 +2686,10 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,
out_sleep:
wl1271_ps_elp_sleep(wl);
+out_free_sta:
+ if (ret < 0)
+ wl1271_free_sta(wl, hlid);
+
out:
mutex_unlock(&wl->mutex);
return ret;
@@ -2719,7 +2726,7 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,
if (ret < 0)
goto out_sleep;
- wl1271_free_hlid(wl, wl_sta->hlid);
+ wl1271_free_sta(wl, wl_sta->hlid);
out_sleep:
wl1271_ps_elp_sleep(wl);
--
1.7.1
next prev parent reply other threads:[~2011-01-31 11:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 11:16 [PATCH v2 00/10] wl12xx: AP-mode per link PSM Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 01/10] wl12xx: fix potential race condition with TX queue watermark Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 02/10] wl12xx: AP-mode - fix race condition on sta connection Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 03/10] wl12xx: AP-mode - TX queue per link in AC Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 04/10] mac80211: do not calc frame duration when using HW rate-control Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 05/10] wl12xx: report invalid TX rate when returning non-TX-ed skbs Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 06/10] mac80211: add HW flag for disabling auto link-PS in AP mode Arik Nemtsov
2011-01-31 11:24 ` Johannes Berg
2011-01-31 11:49 ` Arik Nemtsov
2011-01-31 12:11 ` Johannes Berg
2011-01-31 20:06 ` Luciano Coelho
2011-01-31 20:16 ` Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 07/10] wl12xx: AP-mode - support HW based link PS monitoring Arik Nemtsov
2011-01-31 11:16 ` Arik Nemtsov [this message]
2011-01-31 11:16 ` [PATCH v2 09/10] wl12xx: AP-mode - count free FW TX blocks per link Arik Nemtsov
2011-01-31 11:16 ` [PATCH v2 10/10] wl12xx: AP-mode - management of links in PS-mode Arik Nemtsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296472589-26401-9-git-send-email-arik@wizery.com \
--to=arik@wizery.com \
--cc=coelho@ti.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).