iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix to prevent firmware crash when sending off-channel frames

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJX2sL5AAoJEKFHnKIaPMX6LwgQALq47QZ7ugJg7zG9BpmVe2tU
 a2TCZJ5cghc/bZh12d/BBt48o6/Cx3inSDCnYEmGIrNYr7agbFfn3wO3cK1St1FM
 otjFVuBYlZS5wfEI5NVUtDu0gVq0RxXCFcxLFMEMxqFlk3GiWqK9FvsR8lT9GQSV
 2xE/+0HShNuahYwDGSi9JgIHQC+F3M22q/dD41y2VUUdCw4mbu54KlL0M5JolbWt
 oYnZNKFMdUF0OfrLN7JgqEMsDqg4ybJkggIx7e8zefffeI5ioTef5tVj0G660wTq
 k9Zytuv+sLQY7+zoiiAwpXLGmHaa42mgThGAAvvkHueVM+wh6ulhzGxpNhr8921l
 TWbgYof/hB2FUwmeN/Kz8mw11QxaFTeymFBs+ny0t8oHev0czKwFboJE4t3bTYWh
 GNi9RNxJlq7j8MvqE1LENItmvx6xCo6vVl8Vnil8hwyFnBRYeOH+ePlyzQbA1Des
 KqsxxL0cK6SxaaV5ZCxCS5iOWmzuiIJRH0UY7Z2jsFRuZfsr/17rIdi9bTiI2vsP
 2AImMBtiGpnyWC6tDBrNutLbxJbMQPr7FCv3SUA8sli/cVrFBc6lb6wEvJre8wPx
 +24Xt+oyXoF2NJBThNKieWM4jkirugOas6PHrutbcWGC1tRRr7w3fbVFUwSghJuI
 tluRdueSDJWUc+4r5++b
 =0ett
 -----END PGP SIGNATURE-----

Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

* fix to prevent firmware crash when sending off-channel frames
This commit is contained in:
Kalle Valo 2016-09-17 17:06:22 +03:00
commit db64c5fa59
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
View File

@ -513,6 +513,15 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
int hdrlen = ieee80211_hdrlen(hdr->frame_control);
int queue;
/* IWL_MVM_OFFCHANNEL_QUEUE is used for ROC packets that can be used
* in 2 different types of vifs, P2P & STATION. P2P uses the offchannel
* queue. STATION (HS2.0) uses the auxiliary context of the FW,
* and hence needs to be sent on the aux queue
*/
if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_MVM_OFFCHANNEL_QUEUE &&
skb_info->control.vif->type == NL80211_IFTYPE_STATION)
IEEE80211_SKB_CB(skb)->hw_queue = mvm->aux_queue;
memcpy(&info, skb->cb, sizeof(info));
if (WARN_ON_ONCE(info.flags & IEEE80211_TX_CTL_AMPDU))
@ -526,16 +535,6 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
/* This holds the amsdu headers length */
skb_info->driver_data[0] = (void *)(uintptr_t)0;
/*
* IWL_MVM_OFFCHANNEL_QUEUE is used for ROC packets that can be used
* in 2 different types of vifs, P2P & STATION. P2P uses the offchannel
* queue. STATION (HS2.0) uses the auxiliary context of the FW,
* and hence needs to be sent on the aux queue
*/
if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_MVM_OFFCHANNEL_QUEUE &&
info.control.vif->type == NL80211_IFTYPE_STATION)
IEEE80211_SKB_CB(skb)->hw_queue = mvm->aux_queue;
queue = info.hw_queue;
/*