diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
| commit | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (patch) | |
| tree | d5c8f24075313edfe548256dd931527f1569921e /drivers/net/wireless/mwl8k.c | |
| parent | 415b3334a21aa67806c52d1acf4e72e14f7f402f (diff) | |
| parent | 6e6e8c510a84fe3237ef02b954e58cca6a3f4b1a (diff) | |
| download | linux-3.10-41bf37117b47fc5ce2aae91f6a108e7e42e0b046.tar.gz linux-3.10-41bf37117b47fc5ce2aae91f6a108e7e42e0b046.tar.bz2 linux-3.10-41bf37117b47fc5ce2aae91f6a108e7e42e0b046.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index d633edbd979..da36dbf8d87 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -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); |