From patchwork Tue Nov 24 03:33:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 62374 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAO3Ucko005304 for ; Tue, 24 Nov 2009 03:30:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757890AbZKXDab (ORCPT ); Mon, 23 Nov 2009 22:30:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757842AbZKXDaa (ORCPT ); Mon, 23 Nov 2009 22:30:30 -0500 Received: from mga01.intel.com ([192.55.52.88]:44238 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757890AbZKXDaQ (ORCPT ); Mon, 23 Nov 2009 22:30:16 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 23 Nov 2009 19:25:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,275,1257148800"; d="scan'208";a="516761361" Received: from yzhu-mobl0.sh.intel.com (HELO localhost.localdomain) ([10.239.47.104]) by fmsmga002.fm.intel.com with ESMTP; 23 Nov 2009 19:24:06 -0800 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Samuel Ortiz , Zhu Yi Subject: [PATCH 3/8] iwmc3200wifi: Dont set the UMAC power limit when interface is down Date: Tue, 24 Nov 2009 11:33:28 +0800 Message-Id: <1259033613-25600-4-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1259033613-25600-3-git-send-email-yi.zhu@intel.com> References: <1259033613-25600-1-git-send-email-yi.zhu@intel.com> <1259033613-25600-2-git-send-email-yi.zhu@intel.com> <1259033613-25600-3-git-send-email-yi.zhu@intel.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c index 2e00a4b..7cfc2c0 100644 --- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c @@ -678,6 +678,9 @@ static int iwm_cfg80211_set_txpower(struct wiphy *wiphy, case TX_POWER_AUTOMATIC: return 0; case TX_POWER_FIXED: + if (!test_bit(IWM_STATUS_READY, &iwm->status)) + return 0; + ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX, CFG_TX_PWR_LIMIT_USR, dbm * 2); if (ret < 0) @@ -685,6 +688,7 @@ static int iwm_cfg80211_set_txpower(struct wiphy *wiphy, return iwm_tx_power_trigger(iwm); default: + IWM_ERR(iwm, "Unsupported power type: %d\n", type); return -EOPNOTSUPP; }