---

yaml --- r: 278729 b: refs/heads/master c: e0d6253 h: refs/heads/master i: 278727: 17f9f43 v: v3
git-mirror · Dec 1, 2011 · d80559f · d80559f
1 parent 9b14c30
commit d80559f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d4b9759143aaa280195834820bc15d795e71c1
+refs/heads/master: e0d62536d032db689adf9c8162a9d2caf4714f44
diff --git a/trunk/drivers/net/wireless/wl12xx/tx.c b/trunk/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;
 	}