Pārlūkot izejas kodu

qcacld-3.0: Revert non-logging changes

Revert the non-logging changes brought by
Change-Id I1ae4f366f359fd90856743b4c2689ad9aad3417b.

Change-Id: Ib69b403f644734545bfb0a56959a490778910188
CRs-Fixed: 2014745
Srinivas Girigowda 8 gadi atpakaļ
vecāks
revīzija
5557a396fa

+ 0 - 3
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);
 

+ 1 - 1
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);
 

+ 6 - 9
core/hdd/src/wlan_hdd_power.c

@@ -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;