From patchwork Tue Feb 26 00:13:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 223088 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 085F42C0077 for ; Tue, 26 Feb 2013 11:15:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759977Ab3BZAPf (ORCPT ); Mon, 25 Feb 2013 19:15:35 -0500 Received: from mail-oa0-f52.google.com ([209.85.219.52]:39305 "EHLO mail-oa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932307Ab3BZAOr (ORCPT ); Mon, 25 Feb 2013 19:14:47 -0500 Received: by mail-oa0-f52.google.com with SMTP id k14so4229291oag.11 for ; Mon, 25 Feb 2013 16:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=FJktT+kw1mY77ORYWvTaRHElykhON2E5mkilLh0SC+c=; b=Buo4mXSLW2IHZSEMNdxwycXe/E/yjCuRl2qCbrOywU3cCXNh1qdQsOHc40BymYDwb2 s469zzf0KlL6iOK/BfinYuaEtNduKeic9dpDS1A77ATZuedd9dZBiNySbenTSpbj4YNw aKyQ/dGsd6mbVHMwwXDdsGVebsccut2bbrSGrDKGZYkGchz7QncJFXli42x0CN0tf8XS ykV/5hOwnO3EgmxSYtUfHPjYx6yIAhzxza39kqJAzj2Zul97dlw2knneZoLmZZh/Agwx GJFRtLdAblh/7x7ZKgwl0K55E3o6XRXdYP6xkUh2BTyc+LH42grD2kyFhEiOhrZtoI7t 8r7Q== X-Received: by 10.60.3.71 with SMTP id a7mr176883oea.35.1361837687261; Mon, 25 Feb 2013 16:14:47 -0800 (PST) Received: from linux-2liw.lan (CPE-75-81-36-228.kc.res.rr.com. [75.81.36.228]) by mx.google.com with ESMTPS id d10sm8177318oeh.7.2013.02.25.16.14.45 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Feb 2013 16:14:46 -0800 (PST) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org, jcheung@suse.com, machen@suse.com, mmarek@suse.cz Subject: [RFC/RFT 23/27] rtlwifi: rtl8188ee: Add files for new driver - part 14 Date: Mon, 25 Feb 2013 18:13:35 -0600 Message-Id: <1361837619-2985-24-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1361837619-2985-1-git-send-email-Larry.Finger@lwfinger.net> References: <1361837619-2985-1-git-send-email-Larry.Finger@lwfinger.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch includes some changes found in testing. Signed-off-by: Larry Finger Cc: jcheung@suse.com Cc: machen@suse.com Cc: mmarek@suse.cz --- drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 14 +++++++++----- drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index 9e099da..12912a1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c @@ -1810,8 +1810,12 @@ static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, rtlefuse->txpwrlevel_cck[rf_path][i] = pwrinfo24g.index_cck_base[rf_path][index]; - rtlefuse->txpwrlevel_ht40_1s[rf_path][i] = - pwrinfo24g.index_bw40_base[rf_path][index]; + if (i == 13) + rtlefuse->txpwrlevel_ht40_1s[rf_path][i] = + pwrinfo24g.index_bw40_base[rf_path][4]; + else + rtlefuse->txpwrlevel_ht40_1s[rf_path][i] = + pwrinfo24g.index_bw40_base[rf_path][index]; rtlefuse->txpwr_ht20diff[rf_path][i] = pwrinfo24g.bw20_diff[rf_path][0]; rtlefuse->txpwr_legacyhtdiff[rf_path][i] = @@ -1819,7 +1823,7 @@ static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, } for (i = 0; i < 14; i++) { - RTPRINT(rtlpriv, FINIT, init_txpwr, + RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, "RF(%d)-Ch(%d) [CCK / HT40_1S ] = " "[0x%x / 0x%x ]\n", rf_path, i, rtlefuse->txpwrlevel_cck[rf_path][i], @@ -1838,7 +1842,7 @@ static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, } rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter; - RTPRINT(rtlpriv, FINIT, init_txpwr, + RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter); if (!autoload_fail) { @@ -1848,7 +1852,7 @@ static void _rtl88ee_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, } else { rtlefuse->eeprom_regulatory = 0; } - RTPRINT(rtlpriv, FINIT, init_txpwr, + RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory); } diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c index cff2dd6..690f8e2 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c @@ -181,7 +181,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw) release_firmware(firmware); /* for early mode */ - rtlpriv->rtlhal.earlymode_enable = true; + rtlpriv->rtlhal.earlymode_enable = false; rtlpriv->rtlhal.max_earlymode_num = 10; for (tid = 0; tid < 8; tid++) skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);