From e01c5993830dd31f2a65207105d2c6d558154ecb Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Tue, 3 May 2011 11:35:28 +0200
Subject: [PATCH] --- yaml --- r: 249311 b: refs/heads/master c:
 12392c6d4dff6db1cf10091c2515ac41bfa58c76 h: refs/heads/master i:   249309:
 10ac17b5156a950bfb9ac8788d399801362d2466   249307:
 6887823eedda2aa47007586bd9da8fe07a2363f7   249303:
 0b30d5435e50915b563971b0c7c741c5865fae59   249295:
 ea648fdc0ad0a61710181d87eb56a7241dbea360   249279:
 7f770ce5db335b627aaeb8a0f0ad81f45a6c7ea1 v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/brcmsmac/wl_export.h    |  1 +
 .../staging/brcm80211/brcmsmac/wl_mac80211.c  | 24 +++++++++++++++++++
 .../staging/brcm80211/brcmsmac/wlc_main.c     | 13 ++++++++++
 .../staging/brcm80211/brcmsmac/wlc_pub.h      |  1 +
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b0eb1338755..959f3e3d6adf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be2fee08bb876bd8156d5f0c3e2b2a6ae8885b97
+refs/heads/master: 12392c6d4dff6db1cf10091c2515ac41bfa58c76
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_export.h b/trunk/drivers/staging/brcm80211/brcmsmac/wl_export.h
index 9ff760f4c865..0fe0b24b586f 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_export.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_export.h
@@ -42,5 +42,6 @@ extern void wl_free_timer(struct wl_info *wl, struct wl_timer *timer);
 extern void wl_add_timer(struct wl_info *wl, struct wl_timer *timer, uint ms,
 			 int periodic);
 extern bool wl_del_timer(struct wl_info *wl, struct wl_timer *timer);
+extern void wl_msleep(struct wl_info *wl, uint ms);
 
 #endif				/* _wl_export_h_ */
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index dd46d2e6cbb7..0a11e809bef9 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -149,6 +149,7 @@ static int wl_ops_ampdu_action(struct ieee80211_hw *hw,
 			       struct ieee80211_sta *sta, u16 tid, u16 *ssn,
 			       u8 buf_size);
 static void wl_ops_rfkill_poll(struct ieee80211_hw *hw);
+static void wl_ops_flush(struct ieee80211_hw *hw, bool drop);
 
 static void wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
@@ -667,6 +668,18 @@ static void wl_ops_rfkill_poll(struct ieee80211_hw *hw)
 	wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, blocked);
 }
 
+static void wl_ops_flush(struct ieee80211_hw *hw, bool drop)
+{
+	struct wl_info *wl = HW_TO_WL(hw);
+
+	no_printk("%s: drop = %s\n", __func__, drop ? "true" : "false");
+
+	/* wait for packet queue and dma fifos to run empty */
+	WL_LOCK(wl);
+	wlc_wait_for_tx_completion(wl->wlc, drop);
+	WL_UNLOCK(wl);
+}
+
 static const struct ieee80211_ops wl_ops = {
 	.tx = wl_ops_tx,
 	.start = wl_ops_start,
@@ -688,6 +701,7 @@ static const struct ieee80211_ops wl_ops = {
 	.sta_remove = wl_ops_sta_remove,
 	.ampdu_action = wl_ops_ampdu_action,
 	.rfkill_poll = wl_ops_rfkill_poll,
+	.flush = wl_ops_flush,
 };
 
 /*
@@ -1947,3 +1961,13 @@ bool wl_rfkill_set_hw_state(struct wl_info *wl)
 	WL_LOCK(wl);
 	return blocked;
 }
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+void wl_msleep(struct wl_info *wl, uint ms)
+{
+	WL_UNLOCK(wl);
+	msleep(ms);
+	WL_LOCK(wl);
+}
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index ea7d897b1486..c4e717876bc6 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -8104,3 +8104,16 @@ int wlc_get_curband(struct wlc_info *wlc)
 {
 	return wlc->band->bandunit;
 }
+
+void wlc_wait_for_tx_completion(struct wlc_info *wlc, bool drop)
+{
+	/* flush packet queue when requested */
+	if (drop)
+		pktq_flush(&wlc->active_queue->q, false, NULL, 0);
+
+	/* wait for queue and DMA fifos to run dry */
+	while (!pktq_empty(&wlc->active_queue->q) ||
+	       TXPKTPENDTOT(wlc) > 0) {
+		wl_msleep(wlc->wl, 1);
+	}
+}
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
index 08e5fb5703d9..3dc5b1d1576c 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
@@ -569,6 +569,7 @@ extern void wlc_associate_upd(struct wlc_info *wlc, bool state);
 extern void wlc_scan_start(struct wlc_info *wlc);
 extern void wlc_scan_stop(struct wlc_info *wlc);
 extern int wlc_get_curband(struct wlc_info *wlc);
+extern void wlc_wait_for_tx_completion(struct wlc_info *wlc, bool drop);
 
 static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,
 				    uint *arg)