|
@@ -2176,10 +2176,12 @@ int wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
|
|
|
*/
|
|
|
static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
|
|
|
struct wireless_dev *wdev,
|
|
|
- int *dbm, hdd_adapter_t *adapter)
|
|
|
+ int *dbm)
|
|
|
{
|
|
|
|
|
|
hdd_context_t *pHddCtx = (hdd_context_t *) wiphy_priv(wiphy);
|
|
|
+ struct net_device *ndev = wdev->netdev;
|
|
|
+ hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
|
|
|
int status;
|
|
|
|
|
|
ENTER();
|
|
@@ -2198,7 +2200,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
|
|
|
/* Validate adapter sessionId */
|
|
|
if (wlan_hdd_validate_session_id(adapter->sessionId)) {
|
|
|
hdd_err("invalid session id: %d", adapter->sessionId);
|
|
|
- return -ENOTSUPP;
|
|
|
+ return -EINVAL;
|
|
|
}
|
|
|
|
|
|
mutex_lock(&pHddCtx->iface_change_lock);
|
|
@@ -2237,15 +2239,10 @@ int wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
|
|
|
struct wireless_dev *wdev,
|
|
|
int *dbm)
|
|
|
{
|
|
|
- int ret = -ENOTSUPP;
|
|
|
- struct net_device *ndev = wdev->netdev;
|
|
|
- hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
|
|
|
+ int ret;
|
|
|
|
|
|
cds_ssr_protect(__func__);
|
|
|
- if (adapter->sessionId != HDD_SESSION_ID_INVALID)
|
|
|
- ret = __wlan_hdd_cfg80211_get_txpower(wiphy,
|
|
|
- wdev,
|
|
|
- dbm, adapter);
|
|
|
+ ret = __wlan_hdd_cfg80211_get_txpower(wiphy, wdev, dbm);
|
|
|
cds_ssr_unprotect(__func__);
|
|
|
|
|
|
return ret;
|