[PATCH v2 2/3] mwifiex: move .get_tx_power logic to station ioctl file
From: Javier Martinez Canillas <hidden>
Date: 2016-06-06 17:03:11
Also in:
linux-wireless, lkml
Subsystem:
marvell mwifiex wireless driver, the rest · Maintainers:
Brian Norris, Linus Torvalds
From: Shengzhen Li <redacted> Most cfg80211 operations are just a wrappers to functions defined in the sta_ioctl.c file, so for consistency move the .get_tx_power logic there. Signed-off-by: Shengzhen Li <redacted> Signed-off-by: Amitkumar Karwar <redacted> [javier: update the subject line and commit message] Signed-off-by: Javier Martinez Canillas <redacted> --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +++----------- drivers/net/wireless/marvell/mwifiex/main.h | 2 ++ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index b17f3d09a2c7..ff3f63ed95e1 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c@@ -385,18 +385,10 @@ mwifiex_cfg80211_get_tx_power(struct wiphy *wiphy, int *dbm) { struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy); - struct mwifiex_private *priv = mwifiex_get_priv(adapter, - MWIFIEX_BSS_ROLE_ANY); - int ret = mwifiex_send_cmd(priv, HostCmd_CMD_RF_TX_PWR, - HostCmd_ACT_GEN_GET, 0, NULL, true); - - if (ret < 0) - return ret; - - /* tx_power_level is set in HostCmd_CMD_RF_TX_PWR command handler */ - *dbm = priv->tx_power_level; + struct mwifiex_private *priv; - return 0; + priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY); + return mwifiex_get_tx_power(priv, dbm); } /*
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index 0207af00be42..79c28cfb7780 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h@@ -1464,6 +1464,8 @@ int mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter, int mwifiex_set_tx_power(struct mwifiex_private *priv, struct mwifiex_power_cfg *power_cfg); +int mwifiex_get_tx_power(struct mwifiex_private *priv, int *dbm); + int mwifiex_main_process(struct mwifiex_adapter *); int mwifiex_queue_tx_pkt(struct mwifiex_private *priv, struct sk_buff *skb);
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index 8e0862657122..70ff9b805b5b 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c@@ -775,6 +775,24 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, } /* + * IOCTL request handler to get tx power configuration. + * + * This function prepares the correct firmware command and + * issues it. + */ +int mwifiex_get_tx_power(struct mwifiex_private *priv, int *dbm) +{ + int ret; + + ret = mwifiex_send_cmd(priv, HostCmd_CMD_TXPWR_CFG, + HostCmd_ACT_GEN_GET, 0, NULL, true); + + *dbm = priv->tx_power_level; + + return ret; +} + +/* * IOCTL request handler to get power save mode. * * This function prepares the correct firmware command and
--
2.5.5