Skip to contentSkip to conversation

netdev: fix setting a uint8_t with l_get_le16

PATCH In review James Prestwood 2 participants 4 messages Jan 30, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 netdev: fix setting a uint8_t with l_get_le16

---
 src/netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/netdev.c +1 -1
index 522baf7a..f62a97cf 100644
@@ -4734,7 +4734,7 @@ static void netdev_unprot_disconnect_event(struct l_genl_msg *msg,
 	uint16_t type;
 	uint16_t len;
 	const void *data;
-	uint8_t reason_code;
+	uint16_t reason_code;
 
 	if (!netdev->connected)
 		return;
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/3 netdev: make unprotected disconnect debug log more clear

The debug log was just saying "disconnect event" but we should distinguish between unprotected and protected events.

---
 src/netdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
src/netdev.c +2 -1
index f62a97cf..2b3925dc 100644
@@ -4762,7 +4762,8 @@ static void netdev_unprot_disconnect_event(struct l_genl_msg *msg,
 
 	reason_code = l_get_le16(mmpdu_body(hdr));
 
-	l_info("disconnect event, src="MAC" dest="MAC" bssid="MAC" reason=%u",
+	l_info("unprotected disconnect event, src="MAC" dest="MAC
+			 " bssid="MAC" reason=%u",
 			MAC_STR(hdr->address_2), MAC_STR(hdr->address_1),
 			MAC_STR(hdr->address_3), reason_code);
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/3 station: reverse roam scan results for sorted known frequencies

In reply to James Prestwood

The known frequency list is now a sorted list and the roam scan results were not complying with this new requirement. The fix is easy though since the iteration order of the scan results does not matter (the roam candidates are inserted by rank). To fix the known frequencies order we can simply reverse the scan results list before iterating it.

---
 src/station.c | 6 ++++++
 1 file changed, 6 insertions(+)
src/station.c +6 -0
index 8a5f4e18..ea505ca2 100644
@@ -2636,6 +2636,12 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list,
 		util_address_to_string(current_bss->addr),
 		util_ssid_to_utf8(current_bss->ssid_len, current_bss->ssid));
 
+	/*
+	 * Reverse now so the known frequency list gets updated in the correct
+	 * order (via network_bss_update).
+	 */
+	l_queue_reverse(bss_list);
+
 	while ((bss = l_queue_pop_head(bss_list))) {
 		double rank;
 		uint32_t kbps100 = DIV_ROUND_CLOSEST(bss->data_rate, 100000);
Signature · 1 line
2.34.1