summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorc_zding <c_zding@qti.qualcomm.com>2016-04-19 19:41:36 +0800
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-04-22 15:26:29 +0530
commit169719583b3e6feaa08084bdb37c309e6c7ca855 (patch)
treeb23172355426e1b5e7d058abadb0019f29ee982d
parent593d1aec2cfb171a0b31eb3045d73001c7eb38dd (diff)
qcacld-2.0: Fix wrong return value of wlan_hdd_cfg80211_change_iface
When wlan_hdd_change_iface_to_sta_mode returns VOS_STATUS_E_FAILURE, this error code is returned directly to kernel, which can't be recognized by linux kernel and wpa_supplicant. Change-Id: I444829d050d28562aa4c8afa1a43470f79943707 CRs-Fixed: 995507
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index ead8669d78ef..76bf3bb6efad 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -14019,7 +14019,8 @@ static int wlan_hdd_change_iface_to_sta_mode(struct net_device *ndev,
wext->roamProfile.pAddIEScan = pAdapter->scan_info.scanAddIE.addIEdata;
wext->roamProfile.nAddIEScanLength = pAdapter->scan_info.scanAddIE.length;
EXIT();
- return status;
+
+ return vos_status_to_os_return(status);
}
static int wlan_hdd_cfg80211_change_bss (struct wiphy *wiphy,
@@ -14110,9 +14111,9 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
switch (type) {
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT:
- vstatus = wlan_hdd_change_iface_to_sta_mode(ndev, type);
- if (vstatus != VOS_STATUS_SUCCESS)
- return -EINVAL;
+ status = wlan_hdd_change_iface_to_sta_mode(ndev, type);
+ if (status != 0)
+ return status;
#ifdef QCA_LL_TX_FLOW_CT
if (pAdapter->tx_flow_timer_initialized == VOS_FALSE) {
@@ -14281,7 +14282,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
case NL80211_IFTYPE_P2P_CLIENT:
case NL80211_IFTYPE_ADHOC:
status = wlan_hdd_change_iface_to_sta_mode(ndev, type);
- if (status != VOS_STATUS_SUCCESS)
+ if (status != 0)
return status;
#ifdef QCA_LL_TX_FLOW_CT