Browse Source

qcacmn: Improve logging in scan done callback and BSS ageout

Improve logging in cfg80211 scan done callback, by decreasing the
log level to info from error and printing only the scan complete
events.
Also print a log when BSS is aged out.

Change-Id: If2734df1168bd354415305211b50f6c79bee2df0
CRs-Fixed: 1095299
Abhishek Singh 8 years ago
parent
commit
483d914ab7

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

@@ -277,12 +277,12 @@ nla_put_failure:
 
 /**
  * wlan_cfg80211_scan_done_callback() - scan done callback function called after
- *				scan is finished
- * @pContext: Pointer to context
- * @scanId: Scan Id
- * @status: Scan status
+ * scan is finished
+ * @vdev: vdev ptr
+ * @event: Scan event
+ * @args: Scan cb arg
  *
- * Return: QDF status
+ * Return: void
  */
 static void wlan_cfg80211_scan_done_callback(
 					struct wlan_objmgr_vdev *vdev,
@@ -296,8 +296,15 @@ static void wlan_cfg80211_scan_done_callback(
 	struct wlan_objmgr_pdev *pdev;
 	QDF_STATUS status;
 
-	cfg80211_err("called  with ID = %d, reason = %d",
-				scan_id, event->reason);
+	if (event->type != SCAN_EVENT_TYPE_COMPLETED)
+		return;
+
+	cfg80211_info("scan ID = %d vdev id = %d, event type %s(%d) reason = %s(%d)",
+		scan_id, event->vdev_id,
+		util_scan_get_ev_type_name(event->type),
+		event->type,
+		util_scan_get_ev_reason_name(event->reason),
+		event->reason);
 
 	/*
 	 * cfg80211_scan_done informing NL80211 about completion

+ 5 - 1
umac/scan/core/src/wlan_scan_cache_db.c

@@ -213,8 +213,12 @@ static void scm_check_and_age_out(struct scan_dbs *scan_db,
 	struct scan_cache_node *node)
 {
 	if (util_scan_entry_age(node->entry) >=
-	   SCAN_CACHE_AGING_TIME)
+	   SCAN_CACHE_AGING_TIME) {
+		scm_err("Aging out BSSID: %pM with age %d ms",
+			node->entry->bssid.bytes,
+			util_scan_entry_age(node->entry));
 		scm_scan_entry_put_ref(scan_db, node, true);
+	}
 }
 
 void scm_age_out_entries(struct scan_dbs *scan_db)

+ 2 - 8
umac/scan/dispatcher/src/wlan_scan_utils_api.c

@@ -53,11 +53,8 @@ util_scan_get_ev_type_name(enum scan_event_type type)
 			"FOREIGN_CHANNEL_GET_NF",
 	};
 
-	if (type >= SCAN_EVENT_TYPE_MAX) {
-		scm_err("unknown type : %d", type);
-		QDF_ASSERT(0);
+	if (type >= SCAN_EVENT_TYPE_MAX)
 		return "UNKNOWN";
-	}
 
 	return event_name[type];
 }
@@ -79,11 +76,8 @@ util_scan_get_ev_reason_name(enum scan_completion_reason reason)
 		[SCAN_REASON_MAX_OFFCHAN_RETRIES] = "MAX_OFFCHAN_RETRIES",
 	};
 
-	if (reason >= SCAN_REASON_MAX) {
-		scm_err("unknown reason : %d", reason);
-		QDF_ASSERT(0);
+	if (reason >= SCAN_REASON_MAX)
 		return "UNKNOWN";
-	}
 
 	return reason_name[reason];
 }