From 7f0a14c8e6d6f1caea95d1213738803132a8c00b Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Sun, 5 Feb 2012 15:51:53 +0200 Subject: [PATCH] --- yaml --- r: 287529 b: refs/heads/master c: e81a7bd55531a77d8c16d44766db4089c2983f1b h: refs/heads/master i: 287527: 68780af10d82d58a6e5579f228f5b020dbdf0f55 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 651f06547726..1f690e57e9fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e6b411971de727a5bcea4323331fdaa70a81b11 +refs/heads/master: e81a7bd55531a77d8c16d44766db4089c2983f1b diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c index 0a70149df3fc..98a574a4a465 100644 --- a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c @@ -866,6 +866,14 @@ static int fill_ctrlset(struct zd_mac *mac, ZD_ASSERT(frag_len <= 0xffff); + /* + * Firmware computes the duration itself (for all frames except PSPoll) + * and needs the field set to 0 at input, otherwise firmware messes up + * duration_id and sets bits 14 and 15 on. + */ + if (!ieee80211_is_pspoll(hdr->frame_control)) + hdr->duration_id = 0; + txrate = ieee80211_get_tx_rate(mac->hw, info); cs->modulation = txrate->hw_value;