From patchwork Wed Nov 10 17:56:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guy, Wey-Yi W" X-Patchwork-Id: 315202 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 oAAI1fPU014522 for ; Wed, 10 Nov 2010 18:01:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755432Ab0KJSBe (ORCPT ); Wed, 10 Nov 2010 13:01:34 -0500 Received: from mga09.intel.com ([134.134.136.24]:15248 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754366Ab0KJSBG (ORCPT ); Wed, 10 Nov 2010 13:01:06 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 10 Nov 2010 10:01:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,179,1288594800"; d="scan'208";a="676219830" Received: from wwguy-huron.jf.intel.com (HELO localhost.localdomain) ([134.134.163.194]) by orsmga001.jf.intel.com with ESMTP; 10 Nov 2010 10:01:03 -0800 From: Wey-Yi Guy To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net, Johannes Berg , Wey-Yi Guy Subject: [PATCH 10/16] iwlagn: fix needed chains calculation Date: Wed, 10 Nov 2010 09:56:44 -0800 Message-Id: <1289411810-23093-11-git-send-email-wey-yi.w.guy@intel.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289411810-23093-1-git-send-email-wey-yi.w.guy@intel.com> References: <1289411810-23093-1-git-send-email-wey-yi.w.guy@intel.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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 10 Nov 2010 18:01:43 +0000 (UTC) diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 0228877..1fab1bb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -458,11 +458,13 @@ static void iwlagn_check_needed_chains(struct iwl_priv *priv, >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT; maxstreams += 1; + need_multiple = true; + if ((ht_cap->mcs.rx_mask[1] == 0) && (ht_cap->mcs.rx_mask[2] == 0)) need_multiple = false; if (maxstreams <= 1) - need_multiple = true; + need_multiple = false; } else { /* * If at all, this can only happen through a race