From patchwork Mon Mar 28 11:34:15 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: 668251 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 p2SBbCBq010750 for ; Mon, 28 Mar 2011 11:37:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753371Ab1C1LhK (ORCPT ); Mon, 28 Mar 2011 07:37:10 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:63099 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750802Ab1C1LhJ (ORCPT ); Mon, 28 Mar 2011 07:37:09 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so2744896wya.19 for ; Mon, 28 Mar 2011 04:37:08 -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=QOXRTW5hI/1t/k3vB4T6niJFIni4MxNEC+BUhMJYJAM=; b=hAhNqgx43VZMmoHjsAyAyrWw0QqXKjB8DsSD5O5HDFrDIsLmHAgqTv65QQTPrQyt7V 0IiKpwYAO+BR0AbEJF8lrec/JiZBbCFCu8WO6z621S2ful7n2zRV8J6e9IMmsEI/coQJ /SyOfzgVinHe2gwz9nPkMlA1ajkMsJZU8xDj4= 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=CTKWex1mPwoetfQW1s8LGOho6nTxPuNQlaVNzJv2EYRDYEPkS2kU4LW+OEJFgzXQje Rix7SpL+cmtpov85Aszgq4+N72W5T5nJkqoD3L9vHg6/BDZ6S8oJeY3D/thB1Gkbkr2A wzhdJDC3xWsVCo3z0esfVnj8Yrny270pzcICk= Received: by 10.227.158.2 with SMTP id d2mr3888965wbx.65.1301312226951; Mon, 28 Mar 2011 04:37:06 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id h11sm1945140wbc.9.2011.03.28.04.37.04 (version=SSLv3 cipher=OTHER); Mon, 28 Mar 2011 04:37:05 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 10/13] rt2x00: Fix STBC transmissions to STAs with Rx STBC > 1 Date: Mon, 28 Mar 2011 13:34:15 +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: <201103281329.45470.IvDoorn@gmail.com> <201103281333.05671.IvDoorn@gmail.com> <201103281333.41794.IvDoorn@gmail.com> In-Reply-To: <201103281333.41794.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201103281334.16711.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, 28 Mar 2011 11:37:12 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00ht.c b/drivers/net/wireless/rt2x00/rt2x00ht.c index ae1219d..e8c0c3e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00ht.c +++ b/drivers/net/wireless/rt2x00/rt2x00ht.c @@ -43,8 +43,11 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, txdesc->u.ht.ba_size = 7; /* FIXME: What value is needed? */ - txdesc->u.ht.stbc = - (tx_info->flags & IEEE80211_TX_CTL_STBC) >> IEEE80211_TX_CTL_STBC_SHIFT; + /* + * Only one STBC stream is supported for now. + */ + if (tx_info->flags & IEEE80211_TX_CTL_STBC) + txdesc->u.ht.stbc = 1; /* * If IEEE80211_TX_RC_MCS is set txrate->idx just contains the