[ 030/102] iwlwifi: mvm: fix L2P BA ressources leak

2013-08-08 Thread Greg Kroah-Hartman
3.10-stable review patch.  If anyone has any objections, please let me know.

--

From: Emmanuel Grumbach 

commit 93a426673fbfeae7fa6b27008828e2ac4c08dbee upstream.

We didn't release the Rx AMPDU ressources properly.
This bug led to firmware assert after 16 BA sessions.

Signed-off-by: Emmanuel Grumbach 
Signed-off-by: Johannes Berg 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/net/wireless/iwlwifi/mvm/sta.c |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -621,8 +621,12 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *m
cmd.mac_id_n_color = cpu_to_le32(mvm_sta->mac_id_n_color);
cmd.sta_id = mvm_sta->sta_id;
cmd.add_modify = STA_MODE_MODIFY;
-   cmd.add_immediate_ba_tid = (u8) tid;
-   cmd.add_immediate_ba_ssn = cpu_to_le16(ssn);
+   if (start) {
+   cmd.add_immediate_ba_tid = (u8) tid;
+   cmd.add_immediate_ba_ssn = cpu_to_le16(ssn);
+   } else {
+   cmd.remove_immediate_ba_tid = (u8) tid;
+   }
cmd.modify_mask = start ? STA_MODIFY_ADD_BA_TID :
  STA_MODIFY_REMOVE_BA_TID;
 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[ 030/102] iwlwifi: mvm: fix L2P BA ressources leak

2013-08-08 Thread Greg Kroah-Hartman
3.10-stable review patch.  If anyone has any objections, please let me know.

--

From: Emmanuel Grumbach emmanuel.grumb...@intel.com

commit 93a426673fbfeae7fa6b27008828e2ac4c08dbee upstream.

We didn't release the Rx AMPDU ressources properly.
This bug led to firmware assert after 16 BA sessions.

Signed-off-by: Emmanuel Grumbach emmanuel.grumb...@intel.com
Signed-off-by: Johannes Berg johan...@sipsolutions.net
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org

---
 drivers/net/wireless/iwlwifi/mvm/sta.c |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -621,8 +621,12 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *m
cmd.mac_id_n_color = cpu_to_le32(mvm_sta-mac_id_n_color);
cmd.sta_id = mvm_sta-sta_id;
cmd.add_modify = STA_MODE_MODIFY;
-   cmd.add_immediate_ba_tid = (u8) tid;
-   cmd.add_immediate_ba_ssn = cpu_to_le16(ssn);
+   if (start) {
+   cmd.add_immediate_ba_tid = (u8) tid;
+   cmd.add_immediate_ba_ssn = cpu_to_le16(ssn);
+   } else {
+   cmd.remove_immediate_ba_tid = (u8) tid;
+   }
cmd.modify_mask = start ? STA_MODIFY_ADD_BA_TID :
  STA_MODIFY_REMOVE_BA_TID;
 


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/