diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-03-09 14:28:36 -0800 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-03-10 19:32:19 -0800 |
| commit | 5dc777465ed6f4c607a346c303bec85b874b58bb (patch) | |
| tree | 33f2a705820c5dec13a818b22ee21fdddba0ae7d | |
| parent | 7edf420ed3bf0a7c18b8edb10b16d3fd646a54d7 (diff) | |
qcacld-3.0: Revert non-logging changes
Revert the non-logging changes brought by
Change-Id I1ae4f366f359fd90856743b4c2689ad9aad3417b.
Change-Id: Ib69b403f644734545bfb0a56959a490778910188
CRs-Fixed: 2014745
| -rw-r--r-- | core/hdd/src/wlan_hdd_green_ap.c | 3 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_lpass.c | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_power.c | 15 |
3 files changed, 7 insertions, 13 deletions
diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index aafff0646c5c..a7382220bcbb 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -148,9 +148,6 @@ static void hdd_green_ap_mc(struct hdd_context_s *hdd_ctx, if (green_ap == NULL) return; - if ((hdd_ctx->concurrency_mode << QDF_SAP_MODE) != QDF_SAP_MODE) - return; - hdd_debug("Green-AP event: %d, state: %d, num_nodes: %d", event, green_ap->ps_state, green_ap->num_nodes); diff --git a/core/hdd/src/wlan_hdd_lpass.c b/core/hdd/src/wlan_hdd_lpass.c index 038e70998182..a5777622dfa9 100644 --- a/core/hdd/src/wlan_hdd_lpass.c +++ b/core/hdd/src/wlan_hdd_lpass.c @@ -174,7 +174,7 @@ static void wlan_hdd_send_status_pkg(struct hdd_adapter_s *adapter, return; memset(&data, 0, sizeof(struct wlan_status_data)); - if (is_on && (adapter->sessionId != HDD_SESSION_ID_INVALID)) + if (is_on) ret = wlan_hdd_gen_wlan_status_pack(&data, adapter, sta_ctx, is_on, is_connected); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 7d67d06d1580..fdf4240ac041 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -2408,10 +2408,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(); @@ -2430,7 +2432,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); @@ -2469,15 +2471,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; |