diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-01 12:43:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-01 12:43:07 -0700 |
| commit | a98917acc73181668f2188ec617fea9ce3ac3944 (patch) | |
| tree | f82216c759f286fe9e411856bbdcf6113c8f1030 /net | |
| parent | 417bc4b855f04dd4ad27a7cabe3e7996a7b78ddb (diff) | |
| parent | e16c1bb67a0010b5bad26ddc3e691655fd7456e3 (diff) | |
| download | linux-a98917acc73181668f2188ec617fea9ce3ac3944.tar.gz linux-a98917acc73181668f2188ec617fea9ce3ac3944.tar.bz2 linux-a98917acc73181668f2188ec617fea9ce3ac3944.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5143d203256b..fd4028296613 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -367,7 +367,10 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data; u32 staflags; - if (unlikely(!sta || ieee80211_is_probe_resp(hdr->frame_control))) + if (unlikely(!sta || ieee80211_is_probe_resp(hdr->frame_control) + || ieee80211_is_auth(hdr->frame_control) + || ieee80211_is_assoc_resp(hdr->frame_control) + || ieee80211_is_reassoc_resp(hdr->frame_control))) return TX_CONTINUE; staflags = get_sta_flags(sta); |