From: "Jérôme Pouiller" <Jerome.Pouiller@silabs.com>
To: "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Kalle Valo" <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
"Jérôme Pouiller" <Jerome.Pouiller@silabs.com>
Subject: [PATCH 39/55] staging: wfx: simplify hif_set_uapsd_info() usage
Date: Mon, 16 Dec 2019 17:03:53 +0000 [thread overview]
Message-ID: <20191216170302.29543-40-Jerome.Pouiller@silabs.com> (raw)
In-Reply-To: <20191216170302.29543-1-Jerome.Pouiller@silabs.com>
From: Jérôme Pouiller <jerome.pouiller@silabs.com>
It is useless to keep uapsd_info in struct wfx_vif. This structure can
be rebuilt just before to be sent.
In add, the struct hif_mib_set_uapsd_information comes from hardware
API. It is not intended to be manipulated in upper layers of the driver.
So, this patch relocates the handling of this struct to
hif_set_uapsd_info() (the low level function).
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/staging/wfx/hif_tx_mib.h | 15 +++++++++---
drivers/staging/wfx/sta.c | 42 ++------------------------------
drivers/staging/wfx/wfx.h | 1 -
3 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h
index 9be74881c56c..d77765f75f10 100644
--- a/drivers/staging/wfx/hif_tx_mib.h
+++ b/drivers/staging/wfx/hif_tx_mib.h
@@ -238,12 +238,21 @@ static inline int hif_use_multi_tx_conf(struct wfx_dev *wdev,
&arg, sizeof(arg));
}
-static inline int hif_set_uapsd_info(struct wfx_vif *wvif,
- struct hif_mib_set_uapsd_information *arg)
+static inline int hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val)
{
+ struct hif_mib_set_uapsd_information arg = { };
+
+ if (val & BIT(IEEE80211_AC_VO))
+ arg.trig_voice = 1;
+ if (val & BIT(IEEE80211_AC_VI))
+ arg.trig_video = 1;
+ if (val & BIT(IEEE80211_AC_BE))
+ arg.trig_be = 1;
+ if (val & BIT(IEEE80211_AC_BK))
+ arg.trig_bckgrnd = 1;
return hif_write_mib(wvif->wdev, wvif->id,
HIF_MIB_ID_SET_UAPSD_INFORMATION,
- arg, sizeof(*arg));
+ &arg, sizeof(arg));
}
static inline int hif_erp_use_protection(struct wfx_vif *wvif, bool enable)
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index e59560f499ea..9eca35d91ad3 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -112,44 +112,6 @@ void wfx_cqm_bssloss_sm(struct wfx_vif *wvif, int init, int good, int bad)
mutex_unlock(&wvif->bss_loss_lock);
}
-static int wfx_set_uapsd_param(struct wfx_vif *wvif,
- const struct wfx_edca_params *arg)
-{
- /* Here's the mapping AC [queue, bit]
- * VO [0,3], VI [1, 2], BE [2, 1], BK [3, 0]
- */
-
- if (arg->uapsd_mask & BIT(IEEE80211_AC_VO))
- wvif->uapsd_info.trig_voice = 1;
- else
- wvif->uapsd_info.trig_voice = 0;
-
- if (arg->uapsd_mask & BIT(IEEE80211_AC_VI))
- wvif->uapsd_info.trig_video = 1;
- else
- wvif->uapsd_info.trig_video = 0;
-
- if (arg->uapsd_mask & BIT(IEEE80211_AC_BE))
- wvif->uapsd_info.trig_be = 1;
- else
- wvif->uapsd_info.trig_be = 0;
-
- if (arg->uapsd_mask & BIT(IEEE80211_AC_BK))
- wvif->uapsd_info.trig_bckgrnd = 1;
- else
- wvif->uapsd_info.trig_bckgrnd = 0;
-
- /* Currently pseudo U-APSD operation is not supported, so setting
- * MinAutoTriggerInterval, MaxAutoTriggerInterval and
- * AutoTriggerStep to 0
- */
- wvif->uapsd_info.min_auto_trigger_interval = 0;
- wvif->uapsd_info.max_auto_trigger_interval = 0;
- wvif->uapsd_info.auto_trigger_step = 0;
-
- return hif_set_uapsd_info(wvif, &wvif->uapsd_info);
-}
-
int wfx_fwd_probe_req(struct wfx_vif *wvif, bool enable)
{
wvif->fwd_probe_req = enable;
@@ -382,7 +344,7 @@ int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
hif_set_edca_queue_params(wvif, edca);
if (wvif->vif->type == NL80211_IFTYPE_STATION) {
- wfx_set_uapsd_param(wvif, &wvif->edca);
+ hif_set_uapsd_info(wvif, wvif->edca.uapsd_mask);
if (wvif->setbssparams_done && wvif->state == WFX_STATE_STA)
wfx_update_pm(wvif);
}
@@ -1552,7 +1514,7 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
hif_set_edca_queue_params(wvif, &wvif->edca.params[i]);
}
wvif->edca.uapsd_mask = 0;
- wfx_set_uapsd_param(wvif, &wvif->edca);
+ hif_set_uapsd_info(wvif, wvif->edca.uapsd_mask);
wfx_tx_policy_init(wvif);
wvif = NULL;
diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
index c82d29764d66..ff29163436b6 100644
--- a/drivers/staging/wfx/wfx.h
+++ b/drivers/staging/wfx/wfx.h
@@ -114,7 +114,6 @@ struct wfx_vif {
bool setbssparams_done;
struct wfx_ht_info ht_info;
struct wfx_edca_params edca;
- struct hif_mib_set_uapsd_information uapsd_info;
struct hif_req_set_bss_params bss_params;
struct work_struct bss_params_work;
struct work_struct set_cts_work;
--
2.20.1
next prev parent reply other threads:[~2019-12-16 17:09 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 17:03 [PATCH 00/55] Improve wfx driver Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 01/55] staging: wfx: fix the cache of rate policies on interface reset Jérôme Pouiller
2019-12-17 11:52 ` Greg Kroah-Hartman
2019-12-17 14:35 ` Jérôme Pouiller
2019-12-17 14:49 ` Greg Kroah-Hartman
2019-12-16 17:03 ` [PATCH 03/55] staging: wfx: fix counter overflow Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 02/55] staging: wfx: fix case of lack of tx_retry_policies Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 05/55] staging: wfx: firmware does not support more than 32 total retries Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 04/55] staging: wfx: use boolean appropriately Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 07/55] staging: wfx: ensure that retry policy always fallbacks to MCS0 / 1Mbps Jérôme Pouiller
2019-12-16 18:08 ` Felix Fietkau
2019-12-17 11:01 ` Jérôme Pouiller
2019-12-17 11:20 ` Felix Fietkau
2019-12-17 15:15 ` Jérôme Pouiller
2019-12-18 11:25 ` Felix Fietkau
2019-12-16 17:03 ` [PATCH 06/55] staging: wfx: fix rate control handling Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 08/55] staging: wfx: detect race condition in WEP authentication Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 09/55] staging: wfx: fix hif_set_mfp() with big endian hosts Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 10/55] staging: wfx: fix wrong error message Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 11/55] staging: wfx: increase SPI bus frequency limit Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 13/55] staging: wfx: avoid double warning when no more tx policy are available Jérôme Pouiller
2020-01-03 9:21 ` Dan Carpenter
2020-01-03 10:39 ` Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 14/55] staging: wfx: improve error message on unexpected confirmation Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 12/55] staging: wfx: don't print useless error messages Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 15/55] staging: wfx: take advantage of IS_ERR_OR_NULL() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 16/55] staging: wfx: uniformize naming rule Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 17/55] staging: wfx: use meaningful names for CFG_BYTE_ORDER_* Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 18/55] staging: wfx: remove useless include Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 20/55] staging: wfx: make conditions easier to read Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 19/55] staging: wfx: simplify variable assignment Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 21/55] staging: wfx: ensure that traces never modify arguments Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 22/55] staging: wfx: ensure that received hif messages are never modified Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 23/55] staging: wfx: fix typo in "num_of_ssi_ds" Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 25/55] staging: wfx: fix name of struct hif_req_start_scan_alt Jérôme Pouiller
2020-01-03 9:27 ` Dan Carpenter
2020-01-03 10:30 ` Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 24/55] staging: wfx: fix typo in "num_i_es" Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 26/55] staging: wfx: improve API of hif_req_join->infrastructure_bss_mode Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 27/55] staging: wfx: better naming for hif_req_join->short_preamble Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 28/55] staging: wfx: better naming for hif_mib_set_association_mode->greenfield Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 29/55] staging: wfx: simplify handling of tx_lock in wfx_do_join() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 31/55] staging: wfx: declare wfx_set_pm() static Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 30/55] staging: wfx: firmware already handle powersave mode during scan Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 33/55] staging: wfx: remove redundant test while calling wfx_update_pm() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 32/55] staging: wfx: drop useless argument from wfx_set_pm() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 34/55] staging: wfx: drop unnecessary wvif->powersave_mode Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 35/55] staging: wfx: do not try to save call to hif_set_pm() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 37/55] staging: wfx: simplify wfx_conf_tx() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 36/55] staging: wfx: fix pm_mode timeout Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 38/55] staging: wfx: prefer a bitmask instead of an array of boolean Jérôme Pouiller
2019-12-16 17:03 ` Jérôme Pouiller [this message]
2019-12-16 17:03 ` [PATCH 40/55] staging: wfx: simplify hif_set_pm() usage Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 41/55] staging: wfx: drop struct wfx_edca_params Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 43/55] staging: wfx: simplify hif_set_edca_queue_params() usage Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 42/55] staging: wfx: remove unnecessary EDCA initialisation Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 45/55] staging: wfx: device already handle sleep mode during scan Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 44/55] staging: wfx: hif_scan() never fails Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 46/55] staging: wfx: drop useless wfx_scan_complete() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 47/55] staging: wfx: simplify hif_scan() usage Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 48/55] staging: wfx: introduce update_probe_tmpl() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 49/55] staging: wfx: simplify hif_set_template_frame() usage Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 50/55] staging: wfx: rewrite wfx_hw_scan() Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 51/55] staging: wfx: workaround bug with "iw scan" Jérôme Pouiller
2019-12-16 17:03 ` [PATCH 52/55] staging: wfx: delayed_unjoin cannot happen Jérôme Pouiller
2019-12-16 17:04 ` [PATCH 53/55] staging: wfx: delayed_link_loss " Jérôme Pouiller
2019-12-16 17:04 ` [PATCH 54/55] staging: wfx: implement cancel_hw_scan() Jérôme Pouiller
2019-12-16 17:04 ` [PATCH 55/55] staging: wfx: update TODO Jérôme Pouiller
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=20191216170302.29543-40-Jerome.Pouiller@silabs.com \
--to=jerome.pouiller@silabs.com \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--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).