From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Aug 2013 18:48:40 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=24de851b79a414f0e1813eb131a7d90849cc22c2;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
---

24de851b79a414f0e1813eb131a7d90849cc22c2
diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
index 9f100363b177,7ed94a089d5e..f5329d22840e
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@@ -188,9 -189,10 +188,9 @@@ static void iwl_mvm_te_handle_notif(str
  		}
  
  		iwl_mvm_te_clear_data(mvm, te_data);
- 	} else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
+ 	} else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) {
  		te_data->running = true;
 -		te_data->end_jiffies = jiffies +
 -			TU_TO_JIFFIES(te_data->duration);
 +		te_data->end_jiffies = TU_TO_EXP_TIME(te_data->duration);
  
  		if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
  			set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);