From 650e67ad32de28b1af239c21b78b8c5a712e4920 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bzhao@marvell.com>
Date: Wed, 13 Apr 2011 17:27:09 -0700
Subject: [PATCH] --- yaml --- r: 246895 b: refs/heads/master c:
 53d7938e6a2ac6569476fc59b404e70c0537b42b h: refs/heads/master i:   246893:
 eeb06404ff18caeaa989fdb4c6db9c5b725948d4   246891:
 e9dcdcb5c42f0cb055e38a9d11cd2a0d0501d921   246887:
 c4f4333ba5b95c28f482e0498f07ec866577ec95   246879:
 374274b8d4bd1c5efebf4ffd881b71f9441a4ef3 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/mwifiex/11n.h | 5 +++--
 trunk/drivers/net/wireless/mwifiex/wmm.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 42361541ebe2..d9e1167f9b9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 572e8f3ead47ad223fb428a4f1db986317e8e0ec
+refs/heads/master: 53d7938e6a2ac6569476fc59b404e70c0537b42b
diff --git a/trunk/drivers/net/wireless/mwifiex/11n.h b/trunk/drivers/net/wireless/mwifiex/11n.h
index 9128d2c9638b..02602ff30cbf 100644
--- a/trunk/drivers/net/wireless/mwifiex/11n.h
+++ b/trunk/drivers/net/wireless/mwifiex/11n.h
@@ -92,9 +92,10 @@ mwifiex_is_amsdu_allowed(struct mwifiex_private *priv, int tid)
 }
 
 /*
- * This function checks whether a BA stream is available or not.
+ * This function checks whether a space is available for new BA stream or not.
  */
-static inline u8 mwifiex_is_ba_stream_avail(struct mwifiex_adapter *adapter)
+static inline u8 mwifiex_space_avail_for_new_ba_stream(
+					struct mwifiex_adapter *adapter)
 {
 	struct mwifiex_private *priv;
 	u8 i;
diff --git a/trunk/drivers/net/wireless/mwifiex/wmm.c b/trunk/drivers/net/wireless/mwifiex/wmm.c
index 57b98c59235d..99e8431c1e93 100644
--- a/trunk/drivers/net/wireless/mwifiex/wmm.c
+++ b/trunk/drivers/net/wireless/mwifiex/wmm.c
@@ -1186,7 +1186,7 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter)
 		   mwifiex_send_single_packet() */
 	} else {
 		if (mwifiex_is_ampdu_allowed(priv, tid)) {
-			if (mwifiex_is_ba_stream_avail(adapter)) {
+			if (mwifiex_space_avail_for_new_ba_stream(adapter)) {
 				mwifiex_11n_create_tx_ba_stream_tbl(priv,
 						ptr->ra, tid,
 						BA_STREAM_SETUP_INPROGRESS);