diff options
| author | Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> | 2011-09-29 12:35:06 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 10:20:13 +0000 |
| commit | e0792f214e02cebdd25f7ef8bab08bda018ffd7e (patch) | |
| tree | c39f9d9029ae0270b0dc15e30ef4193fc616055d | |
| parent | 4094d769288fcd86565310fed7e4d18d4f38cff3 (diff) | |
cw1200: Remove WARN_ON on possible execution path
WARN_ON was used to pin-point TXing of a frame with unexpected link_id.
This is a valid case when driver is being stopped and it leads to a confusing
printout.
Change replaces WARN_ON() with wiphy_warn()
Change-Id: I78690af3b564a21eb7289cad9c7352817d9d72f0
Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32500
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33535
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
| -rw-r--r-- | drivers/staging/cw1200/wsm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/cw1200/wsm.c b/drivers/staging/cw1200/wsm.c index 69672992982..0a3b564face 100644 --- a/drivers/staging/cw1200/wsm.c +++ b/drivers/staging/cw1200/wsm.c @@ -1348,9 +1348,13 @@ static bool wsm_handle_tx_data(struct cw1200_common *priv, case NL80211_IFTYPE_AP: if (unlikely(!priv->join_status)) action = doDrop; - else if (WARN_ON(!(BIT(link_id) & - (BIT(0) | priv->link_id_map)))) + else if (unlikely(!(BIT(link_id) & + (BIT(0) | priv->link_id_map)))) { + wiphy_warn(priv->hw->wiphy, + "A frame with expired link id " + "is dropped.\n"); action = doDrop; + } if (cw1200_queue_get_generation(wsm->packetID) > CW1200_MAX_REQUEUE_ATTEMPTS) { /* HACK!!! WSM324 firmware has tendency to requeue |