Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1633293
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Tuomo Rinne <tuomo.rinne@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/3] staging: rtl8192u: Improve code readability |
| Date | Sat, 29 Apr 2017 13:40:01 +0200 |
| Message-ID | <tByTf-5FX-9@gated-at.bofh.it> (permalink) |
| References | <tBbtE-64f-27@gated-at.bofh.it> <tByTf-5FX-7@gated-at.bofh.it> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ufWe15IBadvdILsktarUU+fZWwoRLBnUsfHwlcv55CE=; b=inGIWQWSWsnL35UNn+/zMkxFFylAo5UT8WR/mytKAxOLP6Utb8QvAQ6w83a5LRzUwH YBKdVE74bHE55YBwmpckrqdCiu2vYeljPLtkZmYnPOjaPOX5wULq1Rt8zak/fITWZNvP m6Fgx7v+g1s0aO27yYF+o5lfpnMYySIanLjiWMAEMOUdaSF1PfxwcyVk1/417OTiBw6p O1hV2BUGBrxNjhHgEY5ly9ktlSt59NuTTccyYHstu0z1SxrUBksS+uJxx6nVGgStfc9o emUl6y7A5261DFfuq9B5p1afzlwp5Lbv0fT26g4rLfSpf9LdYNIu6LBfY6jEUcEQ1FgZ 95aA== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ufWe15IBadvdILsktarUU+fZWwoRLBnUsfHwlcv55CE=; b=p2DlbjMFv0nUaBSgSYPkW8Hl5cPSntnt/20jyEfiuU+ekO+dvnU7JrQEJNLQG1BZOn w0C0jYZvBDvlDLKnLhw1bqjBAdtAoQ5/lS35C9gNb/zV+KYW2Ap9GwuSt2Lr8TcWnIl+ KFiONi02x0QF7EGH/jIlq+uHIhh/69H3tTVmcShqWPPGNBSZx31qfU7J4mmln2Mfg1Sc G6W4+Ap8eOd7wuMyoYg9LvNCTUJUmSxTG9k3jfT9bjH9OrBmik33SSlVKu4nF2j/d29h BtKe+FkcO7Ka/CiJ8XSBcBfC3GHuSz0lyyH9J7Hbs4aWlfVvymQO5+ueNWr68tzNRbKF KOEQ== |
| X-Gm-Message-State | AN3rC/4U0SftMeNv0LuMJv5s00rb1qUu7C9NhyLXvQ1E35yPZCseNZ4N XLx9eQFp4RfEvw== |
| X-Received | by 10.80.149.22 with SMTP id u22mr12952387eda.152.1493465709283; Sat, 29 Apr 2017 04:35:09 -0700 (PDT) |
| X-Mailer | git-send-email 2.1.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 54 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org |
| X-Original-Date | Sat, 29 Apr 2017 12:35:05 +0100 |
| X-Original-Message-ID | <1493465706-16290-2-git-send-email-tuomo.rinne@gmail.com> |
| X-Original-References | <20170428102731.GA10820@kroah.com> <1493465706-16290-1-git-send-email-tuomo.rinne@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1633293 |
Show key headers only | View raw
Split the u4bAcParam parameter construction to multiple lines for easier
readability.
Signed-off-by: Tuomo Rinne <tuomo.rinne@gmail.com>
---
drivers/staging/rtl8192u/r8192U_dm.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 16cafb62..5e84ed7 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2300,20 +2300,30 @@ static void dm_check_edca_turbo(
* Restore original EDCA according to the declaration of AP.
*/
if (priv->bcurrent_turbo_EDCA) {
- u8 u1bAIFS;
- u32 u4bAcParam;
+ u8 u1bAIFS;
+ u32 u4bAcParam, op_limit, cw_max, cw_min;
+
struct ieee80211_qos_parameters *qos_parameters = &priv->ieee80211->current_network.qos_data.parameters;
u8 mode = priv->ieee80211->mode;
/* For Each time updating EDCA parameter, reset EDCA turbo mode status. */
dm_init_edca_turbo(dev);
- u1bAIFS = qos_parameters->aifs[0] * ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
- u4bAcParam = (((le16_to_cpu(qos_parameters->tx_op_limit[0])) << AC_PARAM_TXOP_LIMIT_OFFSET)|
- ((le16_to_cpu(qos_parameters->cw_max[0])) << AC_PARAM_ECW_MAX_OFFSET)|
- ((le16_to_cpu(qos_parameters->cw_min[0])) << AC_PARAM_ECW_MIN_OFFSET)|
- ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
- /*write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);*/
- write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+
+ u1bAIFS = qos_parameters->aifs[0] * ((mode & (IEEE_G | IEEE_N_24G)) ? 9 : 20) + aSifsTime;
+
+ op_limit = (u32)le16_to_cpu(qos_parameters->tx_op_limit[0]);
+ cw_max = (u32)le16_to_cpu(qos_parameters->cw_max[0]);
+ cw_min = (u32)le16_to_cpu(qos_parameters->cw_min[0]);
+
+ op_limit <<= AC_PARAM_TXOP_LIMIT_OFFSET;
+ cw_max <<= AC_PARAM_ECW_MAX_OFFSET;
+ cw_min <<= AC_PARAM_ECW_MIN_OFFSET;
+ u1bAIFS <<= AC_PARAM_AIFS_OFFSET;
+
+ u4bAcParam = op_limit | cw_max | cw_min | u1bAIFS;
+
+ write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+
/*
* Check ACM bit.
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: [PATCH] staging: rtl8192u: Improve readability and fix sparse warnings: cast from restricted __le16 Greg KH <gregkh@linuxfoundation.org> - 2017-04-28 12:40 +0200
[PATCH 1/3] staging: rtl8192u: Remove unnecessary scope Tuomo Rinne <tuomo.rinne@gmail.com> - 2017-04-29 13:40 +0200
[PATCH 2/3] staging: rtl8192u: Improve code readability Tuomo Rinne <tuomo.rinne@gmail.com> - 2017-04-29 13:40 +0200
[PATCH 3/3] staging: rtl8192u: Convert u4bAcParam back to little-endian after construction Tuomo Rinne <tuomo.rinne@gmail.com> - 2017-04-29 13:40 +0200
csiph-web