From: Eliad Peller <eliad@wizery.com>
Date: Tue, 8 Nov 2011 14:07:52 +0000 (+0200)
Subject: wl12xx: don't explicitly check for unjoined ibss
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e0d62536d032db689adf9c8162a9d2caf4714f44;p=linux-beck.git

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>
---

diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index fa518a5b7c8b..36eb0d66fd66 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,
 	}
 	hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
 	if (hlid == WL12XX_INVALID_LINK_ID) {
-		if (wlvif->bss_type == BSS_TYPE_IBSS &&
-		    !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags)) {
-			/* It's ok to drop packets when not joined to IBSS */
-			wl1271_debug(DEBUG_TX, "dropping skb while IBSS not "
-				     " joined");
-		} else {
-			wl1271_error("invalid hlid. dropping skb 0x%p", skb);
-		}
-
+		wl1271_error("invalid hlid. dropping skb 0x%p", skb);
 		return -EINVAL;
 	}