Преглед изворни кода

qcacmn: Refactor the prints for rx management frames

Refactor the prints for rx management frames. Do not print beacon,
probe resp and probe req frames in txrx module.
Also remove the beacon print from wlan_cfg80211_inform_bss_frame.

Change-Id: I1dbfcec1614b9465d97c010fa4c386f3a1612f5f
CRs-Fixed: 2381796
Abhishek Singh пре 6 година
родитељ
комит
e88c0e8ffa

+ 7 - 5
os_if/linux/scan/src/wlan_cfg80211_scan.c

@@ -1734,7 +1734,8 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 	bss_data.frame_len = wlan_get_frame_len(scan_params);
 	bss_data.mgmt = qdf_mem_malloc_atomic(bss_data.frame_len);
 	if (!bss_data.mgmt) {
-		cfg80211_err("mem alloc failed");
+		cfg80211_err("mem alloc failed for bss %pM seq %d",
+			     bss_data.mgmt->bssid, scan_params->seq_num);
 		return;
 	}
 	qdf_mem_copy(bss_data.mgmt,
@@ -1755,6 +1756,9 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 	bss_data.chan = wlan_get_ieee80211_channel(wiphy, pdev,
 		scan_params->channel.chan_idx);
 	if (!bss_data.chan) {
+		cfg80211_err("Channel not found for bss %pM seq %d chan %d",
+			     bss_data.mgmt->bssid, scan_params->seq_num,
+			     scan_params->channel.chan_idx);
 		qdf_mem_free(bss_data.mgmt);
 		return;
 	}
@@ -1770,12 +1774,10 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 	qdf_mem_copy(bss_data.per_chain_rssi, scan_params->per_chain_rssi,
 		     WLAN_MGMT_TXRX_HOST_MAX_ANTENNA);
 
-	cfg80211_debug("BSSID: %pM Channel:%d RSSI:%d", bss_data.mgmt->bssid,
-		       bss_data.chan->center_freq, (int)(bss_data.rssi / 100));
-
 	bss = wlan_cfg80211_inform_bss_frame_data(wiphy, &bss_data);
 	if (!bss)
-		cfg80211_err("failed to inform bss");
+		cfg80211_err("failed to inform bss %pM seq %d",
+			     bss_data.mgmt->bssid, scan_params->seq_num);
 	else
 		wlan_cfg80211_put_bss(wiphy, bss);
 

+ 8 - 5
umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c

@@ -921,11 +921,14 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler(
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	mgmt_txrx_debug("Rcvd mgmt frame subtype %x (frame type %u) from %pM, seq_num = %d, rssi = %d tsf_delta: %u",
-			mgmt_subtype, frm_type, wh->i_addr2,
-			(le16toh(*(uint16_t *)wh->i_seq) >>
-			WLAN_SEQ_SEQ_SHIFT), mgmt_rx_params->rssi,
-			mgmt_rx_params->tsf_delta);
+	if (!(mgmt_subtype == MGMT_SUBTYPE_BEACON ||
+	      mgmt_subtype == MGMT_SUBTYPE_PROBE_RESP ||
+	      mgmt_subtype == MGMT_SUBTYPE_PROBE_REQ))
+		mgmt_txrx_debug("Rcvd mgmt frame subtype %x (frame type %u) from %pM, seq_num = %d, rssi = %d tsf_delta: %u",
+				mgmt_subtype, frm_type, wh->i_addr2,
+				(le16toh(*(uint16_t *)wh->i_seq) >>
+				WLAN_SEQ_SEQ_SHIFT), mgmt_rx_params->rssi,
+				mgmt_rx_params->tsf_delta);
 
 	mgmt_txrx_psoc_ctx = (struct mgmt_txrx_priv_psoc_context *)
 			wlan_objmgr_psoc_get_comp_private_obj(psoc,

+ 13 - 11
umac/scan/core/src/wlan_scan_cache_db.c

@@ -782,18 +782,19 @@ QDF_STATUS scm_handle_bcn_probe(struct scheduler_msg *msg)
 
 		scan_entry = scan_node->entry;
 
-		scm_debug("Received %s from BSSID: %pM tsf_delta = %u Seq Num: %x  ssid:%.*s, rssi: %d pdev_id = %d",
-			  (bcn->frm_type == MGMT_SUBTYPE_PROBE_RESP) ?
-			  "Probe Rsp" : "Beacon", scan_entry->bssid.bytes,
-			  scan_entry->tsf_delta, scan_entry->seq_num,
-			  scan_entry->ssid.length, scan_entry->ssid.ssid,
-			  scan_entry->rssi_raw,
-			  wlan_objmgr_pdev_get_pdev_id(pdev));
+		scm_nofl_debug("Received %s from BSSID: %pM tsf_delta = %u Seq Num: %d  ssid:%.*s, rssi: %d pdev_id = %d",
+			       (bcn->frm_type == MGMT_SUBTYPE_PROBE_RESP) ?
+			       "Probe Rsp" : "Beacon", scan_entry->bssid.bytes,
+			       scan_entry->tsf_delta, scan_entry->seq_num,
+			       scan_entry->ssid.length, scan_entry->ssid.ssid,
+			       scan_entry->rssi_raw,
+			       wlan_objmgr_pdev_get_pdev_id(pdev));
 
 		if (scan_obj->drop_bcn_on_chan_mismatch &&
 			scan_entry->channel_mismatch) {
-			scm_debug("Drop frame, as channel mismatch Received for from BSSID: %pM ",
-				   scan_entry->bssid.bytes);
+			scm_debug("Drop frame, as channel mismatch Received for from BSSID: %pM Seq Num: %d",
+				   scan_entry->bssid.bytes,
+				   scan_entry->seq_num);
 			util_scan_free_cache_entry(scan_entry);
 			qdf_mem_free(scan_node);
 			continue;
@@ -807,8 +808,9 @@ QDF_STATUS scm_handle_bcn_probe(struct scheduler_msg *msg)
 
 		status = scm_add_update_entry(psoc, pdev, scan_entry);
 		if (QDF_IS_STATUS_ERROR(status)) {
-			scm_debug("failed to add entry for BSSID: %pM",
-				  scan_entry->bssid.bytes);
+			scm_debug("failed to add entry for BSSID: %pM Seq Num: %d",
+				  scan_entry->bssid.bytes,
+				  scan_entry->seq_num);
 			util_scan_free_cache_entry(scan_entry);
 			qdf_mem_free(scan_node);
 			continue;