From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 13 Feb 2014 19:43:02 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0e028ab0fb2da47fd235dafd4159859892e73d08;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

0e028ab0fb2da47fd235dafd4159859892e73d08
diff --cc drivers/net/wireless/iwlwifi/mvm/tx.c
index 8d18bf23e4bf,4df12fa9d336..74d60bf27750
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@@ -692,13 -680,7 +698,12 @@@ static void iwl_mvm_rx_tx_cmd_single(st
  			iwl_mvm_check_ratid_empty(mvm, sta, tid);
  			spin_unlock_bh(&mvmsta->lock);
  		}
 +
 +		if (mvmsta->next_status_eosp) {
 +			mvmsta->next_status_eosp = false;
 +			ieee80211_sta_eosp(sta);
 +		}
  	} else {
- 		sta = NULL;
  		mvmsta = NULL;
  	}