From: Eliad Peller <eliad@wizery.com>
To: Luciano Coelho <coelho@ti.com>
Cc: <linux-wireless@vger.kernel.org>
Subject: [PATCH 6/7] wl12xx: stop device role on remove_interface
Date: Sun, 18 Dec 2011 20:25:44 +0200 [thread overview]
Message-ID: <1324232745-22928-7-git-send-email-eliad@wizery.com> (raw)
In-Reply-To: <1324232745-22928-1-git-send-email-eliad@wizery.com>
When removing a sta/ibss role, the device role has to
stopped (and disabled) as well.
Signed-off-by: Eliad Peller <eliad@wizery.com>
---
drivers/net/wireless/wl12xx/main.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 7a2ed34..4b68b2a 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2189,7 +2189,11 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
if (ret < 0)
goto deinit;
- if (wlvif->bss_type == BSS_TYPE_STA_BSS) {
+ if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+ wlvif->bss_type == BSS_TYPE_IBSS) {
+ if (wl12xx_dev_role_started(wlvif))
+ wl12xx_stop_dev(wl, wlvif);
+
ret = wl12xx_cmd_role_disable(wl, &wlvif->dev_role_id);
if (ret < 0)
goto deinit;
--
1.7.6.401.g6a319
next prev parent reply other threads:[~2011-12-18 18:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-18 18:25 [PATCH 0/7] wl12xx: various (multi-vif) fixes Eliad Peller
2011-12-18 18:25 ` [PATCH 1/7] wl12xx: implement change_interface Eliad Peller
2011-12-18 18:37 ` Arik Nemtsov
2011-12-18 22:16 ` Eliad Peller
2011-12-18 18:25 ` [PATCH 2/7] wl12xx: remove redundant code from wl1271_op_conf_tx Eliad Peller
2011-12-18 18:25 ` [PATCH 3/7] wl12xx: make WL1271_FLAG_IDLE flag per-vif Eliad Peller
2011-12-18 18:25 ` [PATCH 4/7] wl12xx: flush packets before stopping dev role Eliad Peller
2011-12-18 18:25 ` [PATCH 5/7] wl12xx: fix checking of started " Eliad Peller
2011-12-18 18:25 ` Eliad Peller [this message]
2011-12-18 18:25 ` [PATCH 7/7] wl12xx: check the actual vif operstate in wl1271_dev_notify Eliad Peller
2011-12-20 20:50 ` [PATCH 0/7] wl12xx: various (multi-vif) fixes Luciano Coelho
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=1324232745-22928-7-git-send-email-eliad@wizery.com \
--to=eliad@wizery.com \
--cc=coelho@ti.com \
--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