aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-11-08 09:07:52 -0500
committerLuciano Coelho <coelho@ti.com>2011-12-01 08:56:17 -0500
commite0d62536d032db689adf9c8162a9d2caf4714f44 (patch)
treefac30cbd0c35f794882e26e17136ae9b3828b08b
parent12d4b9759143aaa280195834820bc15d795e71c1 (diff)
wl12xx: don't explicitly check for unjoined ibss
After the ibss carrier issue was fixed, we can revert the following patch: commit 48309fd477ef867babb6819f67fe082c133a5fa9 Author: Shahar Lev <shahar@wizery.com> Date: Fri Oct 7 18:17:25 2011 +0200 wl12xx: remove warning message during IBSS Tx mac80211 sets the carrier on an IBSS interface even when no network is joined. Ignore garbage frames transmitted on a disconnected IBSS interface without printing warnings. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r--drivers/net/wireless/wl12xx/tx.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index fa518a5b7c8..36eb0d66fd6 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -427,15 +427,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
427 } 427 }
428 hlid = wl12xx_tx_get_hlid(wl, wlvif, skb); 428 hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
429 if (hlid == WL12XX_INVALID_LINK_ID) { 429 if (hlid == WL12XX_INVALID_LINK_ID) {
430 if (wlvif->bss_type == BSS_TYPE_IBSS && 430 wl1271_error("invalid hlid. dropping skb 0x%p", skb);
431 !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags)) {
432 /* It's ok to drop packets when not joined to IBSS */
433 wl1271_debug(DEBUG_TX, "dropping skb while IBSS not "
434 " joined");
435 } else {
436 wl1271_error("invalid hlid. dropping skb 0x%p", skb);
437 }
438
439 return -EINVAL; 431 return -EINVAL;
440 } 432 }
441 433