From: Larry Finger <Larry.Finger@lwfinger.net>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Larry Finger <Larry.Finger@lwfinger.net>,
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 [thread overview]
Message-ID: <1361837619-2985-24-git-send-email-Larry.Finger@lwfinger.net> (raw)
In-Reply-To: <1361837619-2985-1-git-send-email-Larry.Finger@lwfinger.net>
This patch includes some changes found in testing.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
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]);
--
1.8.1.4
next prev parent reply other threads:[~2013-02-26 0:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 0:13 [RFC/RFT 00/27] Updates for the rtlwifi family of drivers Larry Finger
2013-02-26 0:13 ` [RFC/RFT 01/27] rtlwifi: Modify the master header for for updates to vendor version 2013.02.07 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 03/27] rtlwifi: Modify files for 2013.02.07 vendor version - part 3 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 04/27] rtlwifi: Modify files for 2013.02.07 vendor version - part 4 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 05/27] " Larry Finger
2013-02-26 0:13 ` [RFC/RFT 06/27] rtlwifi: rtl8192se: Update driver to match vendor driver of 2013.02.07 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 08/27] rtlwifi: rtl8192c: rtl8192ce: Update to " Larry Finger
[not found] ` <1361837619-2985-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2013-02-26 0:13 ` [RFC/RFT 02/27] rtlwifi: Modify files for 2013.02.07 vendor version - part 2 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 07/27] rtlwifi: rtl8723ae: Update to vendor driver of 2013.02.07 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 09/27] rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter() to use work queue Larry Finger
2013-02-26 0:13 ` [RFC/RFT 11/27] rtlwifi: rtl8188ee: Add new driver files - part 2 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 15/27] rtlwifi: rtl8188ee: Add files for new driver - part 6 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 20/27] rtlwifi: rtl8188ee: Add files for new driver - part 11 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 27/27] rtlwifi: rtl8188ee: Enable build of new driver Larry Finger
2013-02-26 0:13 ` [RFC/RFT 10/27] rtlwifi: rtl8188ee: Add new driver - part 1 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 12/27] rtlwifi: rtl8188ee: Add new driver files - part 3 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 13/27] rtlwifi: rtl8188ee: Add files for new driver - part 4 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 14/27] rtlwifi: rtl8188ee: Add files for new driver - part 5 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 16/27] rtlwifi: rtl8188ee: Add files for new driver - part 7 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 17/27] rtlwifi: rtl8188ee: Add files for new driver - part 8 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 18/27] rtlwifi: rtl8188ee: Add files for new driver - part 9 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 19/27] rtlwifi: rtl8188ee: Add files for new driver - part 10 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 21/27] rtlwifi: rtl8188ee: Add files for new driver - part 12 Larry Finger
2013-02-26 0:13 ` [RFC/RFT 22/27] rtlwifi: rtl8188ee: Add files for new driver - part 13 Larry Finger
2013-02-26 0:13 ` Larry Finger [this message]
2013-02-26 0:13 ` [RFC/RFT 24/27] rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes required by adding rtl81988ee Larry Finger
2013-02-26 0:13 ` [RFC/RFT 25/27] rtlwifi: rtl8188ee: Enable recognition of RTL8188EE Larry Finger
2013-02-26 0:13 ` [RFC/RFT 26/27] rtlwifi: rtl8188e: Remove some CamelCase variable names Larry Finger
2013-02-26 2:22 ` [RFC/RFT 00/27] Updates for the rtlwifi family of drivers Joe Perches
2013-02-26 3:04 ` Larry Finger
[not found] ` <512C264A.3000104-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2013-02-26 3:26 ` Joe Perches
[not found] ` <CALx5=V_Y2=bZWXzc9uQkmTBAECeMLbnPU0VA56Wp2tNeBB3Dqw@mail.gmail.com>
2013-03-07 17:01 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361837619-2985-24-git-send-email-Larry.Finger@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=jcheung@suse.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=machen@suse.com \
--cc=mmarek@suse.cz \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).