Backport changes in combined_link_metric_periodic_collection

src/cntlr.c

@@ -1912,7 +1912,7 @@ static void cntlr_ageout_nodes(struct controller *c)
 static void combined_link_metric_periodic_collection(struct controller *c)
 {
 	trace("%s: --->\n", __func__);
-	struct node *p;
+	struct node *p = NULL;
 	uint8_t *radiolist = NULL, *bsslist = NULL;
 
 	/* AP metrics query for each agent */
@@ -1921,7 +1921,7 @@ static void combined_link_metric_periodic_collection(struct controller *c)
 		uint8_t *new_radiolist;
 		struct node *n;
 		struct cmdu_buff *cmdu;
-		struct netif_radio *r;
+		struct netif_radio *r = NULL;
 		int num_bss = 0, num_radio = 0;
 		uint8_t hwaddr[6];
 
@@ -1930,7 +1930,7 @@ static void combined_link_metric_periodic_collection(struct controller *c)
 		memcpy(hwaddr, p->alid, 6);
 		/* For each radio */
 		list_for_each_entry(r, &p->radiolist, list) {
-			struct netif_iface *bss;
+			struct netif_iface *bss = NULL;
 			int radio_index;
 
 			/* Building a radiolist of all radios */
@@ -1971,14 +1971,18 @@ static void combined_link_metric_periodic_collection(struct controller *c)
 				memcpy(bsslist + bss_index, bss->bss->bssid, 6);
 			}
 		}
+
+		if (num_bss > 0) {
 			cmdu = cntlr_gen_ap_metrics_query(c, hwaddr, num_bss, bsslist, num_radio, radiolist);
 			if (!cmdu) {
 				trace("cmdu_gen failed!\n");
 				goto error;
 			}
-
 			send_cmdu(c, cmdu);
 			cmdu_free(cmdu);
+		} else {
+			dbg("Skip sending AP metrics query, no BSS to query\n");
+		}
 
 		/* query i1905d base CMDU */
 		cmdu = ieee1905_ubus_buildcmdu(c->ubus_ctx, CMDU_TYPE_LINK_METRIC_RESPONSE);