Return-path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:40543 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750837Ab1BLAF1 (ORCPT ); Fri, 11 Feb 2011 19:05:27 -0500 Received: by gxk9 with SMTP id 9so1313092gxk.19 for ; Fri, 11 Feb 2011 16:05:26 -0800 (PST) From: Thomas Pedersen To: linux-wireless@vger.kernel.org Cc: buytenh@wantstofly.org Subject: [PATCH 1/2] mwl8k: fix rf_antenna rx argument for AP Date: Fri, 11 Feb 2011 16:03:50 -0800 Message-Id: <1297469031-21004-1-git-send-email-thomas@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Nishant Sarmukadam When configuring rx antennas using CMD_RF_ANTENNA_, the argument input is the number of antennas to be enabled. For AP, we support 3 rx antennas and hence set the field to 3. For tx antennas, value is a bitmap, so 0x7 enables all three. Signed-off-by: Nishant Sarmukadam Signed-off-by: Pradeep Nemavat Signed-off-by: Thomas Pedersen --- drivers/net/wireless/mwl8k.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index af4f2c6..f79da1b 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -3945,9 +3945,13 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed) if (rc) goto out; - rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x7); - if (!rc) - rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7); + rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x3); + if (rc) + wiphy_warn(hw->wiphy, "failed to set # of RX antennas"); + rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7); + if (rc) + wiphy_warn(hw->wiphy, "failed to set # of TX antennas"); + } else { rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level); if (rc) -- 1.7.0.4