summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2013-08-02 21:02:51 -0400
committerSolomon Peachy <pizza@shaftnet.org>2013-08-02 21:02:51 -0400
commit3362e9e6999baee09f1ea0897422792b1bec520b (patch)
tree9cc3182aa8ddc71a5fcac201efc7158d3abd8c06
parent67d580065fc4139dba3c044081c4e2076db588ae (diff)
downloadcompat-wireless-cw1200-3362e9e6999baee09f1ea0897422792b1bec520b.tar.gz
compat-wireless-cw1200-3362e9e6999baee09f1ea0897422792b1bec520b.tar.bz2
compat-wireless-cw1200-3362e9e6999baee09f1ea0897422792b1bec520b.zip
[cw1200] Fix intermittent BUG_ON() trigger when starting AP mode.
The underlying race condition isn't fixed by this commit, but there's no good reason for the BUG() call when we can cleanly recover.
-rw-r--r--drivers/net/wireless/cw1200/sta.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c
index 7dc0b08..a05f69a 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -1408,11 +1408,8 @@ static void cw1200_do_unjoin(struct cw1200_common *priv)
if (!priv->join_status)
goto done;
- if (priv->join_status > CW1200_JOIN_STATUS_IBSS) {
- wiphy_err(priv->hw->wiphy, "Unexpected: join status: %d\n",
- priv->join_status);
- BUG_ON(1);
- }
+ if (priv->join_status == CW1200_JOIN_STATUS_AP)
+ goto done;
cancel_work_sync(&priv->update_filtering_work);
cancel_work_sync(&priv->set_beacon_wakeup_period_work);