From patchwork Tue Jan 11 16:59:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Walle X-Patchwork-Id: 78415 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ADE69B6F1E for ; Wed, 12 Jan 2011 04:00:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932405Ab1AKQ74 (ORCPT ); Tue, 11 Jan 2011 11:59:56 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:56220 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932276Ab1AKQ7y (ORCPT ); Tue, 11 Jan 2011 11:59:54 -0500 Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Lbh4l-1Q1cGp152Z-00lA5d; Tue, 11 Jan 2011 17:59:52 +0100 Received: from agamemnon.CS.local (unknown [192.168.102.58]) by corscience.de (Postfix) with ESMTP id C2E025211E; Tue, 11 Jan 2011 17:59:51 +0100 (CET) From: Bernhard Walle To: lrodriguez@atheros.com, jmalinen@atheros.com, vasanth@atheros.com, senthilkumar@atheros.com, linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [RFC] ath9k: Fix reporting of RX STBC streams to userspace Date: Tue, 11 Jan 2011 17:59:54 +0100 Message-Id: <1294765194-30542-1-git-send-email-walle@corscience.de> X-Mailer: git-send-email 1.7.1 X-Provags-ID: V02:K0:RcMuxxqx8+mpjfQkJniZnLz3pkcXU1KbOru7zQ6s33f lvohRglMGuMC4bNliFsfkFiGj8yOms5dR4haR8yxu4zrRjUbrk YGFpC8BkAPhTYT597H8gL0TPenZNLprJ02bpcLGDOpxfuZ7MGO 9SuRwfLgkuKHinmis2gLhnKSu/1tYzpPQhvEjp3pBSZqCnThLD 92c2supySeb+QvtUTHO7A== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While the driver reports ath: TX streams 2, RX streams: 2 in the kernel log (with ATH_DBG_CONFIG set in the debug module parameter), "iw list" only reported [...] Capabilities: 0x12ce HT20/HT40 SM Power Save disabled RX HT40 SGI TX STBC RX STBC 1-streams [...] The driver seems to set the value as flag while the iw tool interprets it as number. This patch fixes that. Signed-off-by: Bernhard Walle --- drivers/net/wireless/ath/ath9k/init.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 639dc93..935b6c3 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -215,17 +215,17 @@ static void setup_ht_cap(struct ath_softc *sc, else max_streams = 2; - if (AR_SREV_9280_20_OR_LATER(ah)) { - if (max_streams >= 2) - ht_info->cap |= IEEE80211_HT_CAP_TX_STBC; - ht_info->cap |= (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT); - } - /* set up supported mcs set */ memset(&ht_info->mcs, 0, sizeof(ht_info->mcs)); tx_streams = ath9k_cmn_count_streams(common->tx_chainmask, max_streams); rx_streams = ath9k_cmn_count_streams(common->rx_chainmask, max_streams); + if (AR_SREV_9280_20_OR_LATER(ah)) { + if (max_streams >= 2) + ht_info->cap |= IEEE80211_HT_CAP_TX_STBC; + ht_info->cap |= (rx_streams << IEEE80211_HT_CAP_RX_STBC_SHIFT); + } + ath_print(common, ATH_DBG_CONFIG, "TX streams %d, RX streams: %d\n", tx_streams, rx_streams);