xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source
This commit is contained in:
John W. Linville
2011-07-22 17:51:16 -04:00
parent 415b3334a2 6e6e8c510a
commit 41bf37117b
177 changed files with 7152 additions and 6086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/mwl8k.c
View File

@@ -1892,9 +1892,9 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
txpriority = index;
if (ieee80211_is_data_qos(wh->frame_control) &&
skb->protocol != cpu_to_be16(ETH_P_PAE) &&
sta->ht_cap.ht_supported && priv->ap_fw) {
if (priv->ap_fw && sta && sta->ht_cap.ht_supported
&& skb->protocol != cpu_to_be16(ETH_P_PAE)
&& ieee80211_is_data_qos(wh->frame_control)) {
tid = qos & 0xf;
mwl8k_tx_count_packet(sta, tid);
spin_lock(&priv->stream_lock);