[openwrt/openwrt] uqmi: fix data-format parsing

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 18 14:28:57 PDT 2025


blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/9d83c1b1a9d4991958870b247552551661af4c3b

commit 9d83c1b1a9d4991958870b247552551661af4c3b
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Sun Sep 14 11:07:38 2025 +0200

    uqmi: fix data-format parsing
    
    wda-get-data-format now returns an object instead of a single string.
    Account for this change when reading the packet data format.
    
    Suggested-by: Sebastian Ertz (https://github.com/sebastianertz)
    Signed-off-by: David Bauer <mail at david-bauer.net>
    (cherry picked from commit cd20ae44f22d7a10d3522ad94894ca34828fa163)
---
 package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
index a6a3fdaa69..ebce281b80 100755
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -232,9 +232,10 @@ proto_qmi_setup() {
 	# Set IP format
 	uqmi -s -d "$device" -t 1000 --set-data-format 802.3 > /dev/null 2>&1
 	uqmi -s -d "$device" -t 1000 --wda-set-data-format 802.3 > /dev/null 2>&1
-	dataformat="$(uqmi -s -d "$device" -t 1000 --wda-get-data-format)"
+	json_load "$(uqmi -s -d "$device" -t 1000 --wda-get-data-format)"
+	json_get_var dataformat link-layer-protocol
 
-	if [ "$dataformat" = '"raw-ip"' ]; then
+	if [ "$dataformat" = "raw-ip" ]; then
 
 		[ -f /sys/class/net/$ifname/qmi/raw_ip ] || {
 			echo "Device only supports raw-ip mode but is missing this required driver attribute: /sys/class/net/$ifname/qmi/raw_ip"




More information about the lede-commits mailing list