From 9287568b1f948f8ec2378ee1716be8d4f7be629a Mon Sep 17 00:00:00 2001 From: Ulrich Kunitz Date: Sat, 21 Jul 2007 22:42:02 +0100 Subject: [PATCH] --- yaml --- r: 63723 b: refs/heads/master c: 69dad6e563140ce8578749a8c8651b7f1db8cdbc h: refs/heads/master i: 63721: 65573211422b091989fe1b89e47e9113e816bbc6 63719: e734d6f750fce2097932d3ffb65ec41e04d3d3f0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 36261c8b9bef..c2a4cd7b3147 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c43bff43e0617dd56515b4ea42a8037c699c86f1 +refs/heads/master: 69dad6e563140ce8578749a8c8651b7f1db8cdbc diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c index f6c487aa8246..26869d107e52 100644 --- a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c @@ -822,7 +822,7 @@ static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs, cs->control |= ZD_CS_MULTICAST; /* PS-POLL */ - if (stype == IEEE80211_STYPE_PSPOLL) + if (ftype == IEEE80211_FTYPE_CTL && stype == IEEE80211_STYPE_PSPOLL) cs->control |= ZD_CS_PS_POLL_FRAME; /* Unicast data frames over the threshold should have RTS */