From patchwork Mon Apr 18 13:28:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 715221 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3IDZmEO000691 for ; Mon, 18 Apr 2011 13:36:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753925Ab1DRNfx (ORCPT ); Mon, 18 Apr 2011 09:35:53 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:53097 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754021Ab1DRNfw (ORCPT ); Mon, 18 Apr 2011 09:35:52 -0400 Received: by mail-fx0-f46.google.com with SMTP id 17so2833789fxm.19 for ; Mon, 18 Apr 2011 06:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; bh=xB2FHqdRt1qzYqJET+p/vt4MVIpjnbL35q22GKluk48=; b=w/wizYeAWmPHjaOlFVNs+jIIw7/r0UEDCpTI7ieArAllC1sjO4BAVgabYffpYad0ar o0SmtaL+WzlSVRXizNHZyOK9804SQ9O3l7xWE21dRqyu3l+mLKVgcouhYsUFM0mSShBx QsSQEd4jsaBsG+hRU9PQR7ifE80m6Etfs9mEo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=DHoAzffU9NeoXlO/xuqckcpMg4Pl4Xhs6f6BCPDcCtM/EVHuXkDVJX+Hp+G2nwP4I3 5Y3gzEbh3VxFzShl1uipdLFnTE2i6mFkA1KLQfyhvgwXgVMP7ay0soGe/tl3uXypap7P 1/SMvVOZtWR+loBRhM5mgvVg7+E3lpDc7Y5pY= Received: by 10.223.101.87 with SMTP id b23mr4938966fao.97.1303133752000; Mon, 18 Apr 2011 06:35:52 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id c21sm1673551fac.46.2011.04.18.06.35.49 (version=SSLv3 cipher=OTHER); Mon, 18 Apr 2011 06:35:50 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 07/23] rt2x00: Use TXOP_HTTXOP for beacons Date: Mon, 18 Apr 2011 15:28:50 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201104181526.01722.IvDoorn@gmail.com> <201104181528.05047.IvDoorn@gmail.com> <201104181528.28208.IvDoorn@gmail.com> In-Reply-To: <201104181528.28208.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201104181528.51457.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 13:36:10 +0000 (UTC) From: Helmut Schaa Use TXOP_HTTXOP for beacons to stay in sync with the legacy drivers. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2x00ht.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00ht.c b/drivers/net/wireless/rt2x00/rt2x00ht.c index e8c0c3e..a30f68c 100644 --- a/drivers/net/wireless/rt2x00/rt2x00ht.c +++ b/drivers/net/wireless/rt2x00/rt2x00ht.c @@ -92,14 +92,15 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, /* * Determine IFS values - * - Use TXOP_BACKOFF for management frames + * - Use TXOP_BACKOFF for management frames except beacons * - Use TXOP_SIFS for fragment bursts * - Use TXOP_HTTXOP for everything else * * Note: rt2800 devices won't use CTS protection (if used) * for frames not transmitted with TXOP_HTTXOP */ - if (ieee80211_is_mgmt(hdr->frame_control)) + if (ieee80211_is_mgmt(hdr->frame_control) && + !ieee80211_is_beacon(hdr->frame_control)) txdesc->u.ht.txop = TXOP_BACKOFF; else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)) txdesc->u.ht.txop = TXOP_SIFS;