[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  autocore: ethinfo: rewritten in lua
  umbim: fixes build with gcc 11 (coolsnowwolf#10163)

Author: github-actions[bot]

package/lean/autocore/files/arm/sbin/ethinfo

@@ -1,39 +1,37 @@
-#!/bin/sh
-
-a=$(ls /sys/class/net/*/device/uevent | grep eth | awk -F '/' '{print $5}')
-b=$(echo "$a" | wc -l)
-rm -f /tmp/state/ethinfo
-
-echo -n "[" > /tmp/state/ethinfo
-
-for i in $(seq 1 $b)
-do
-	h=$(echo '{"name":' )
-	c=$(echo "$a" | sed -n ${i}p)
-	d=$(ethtool $c)
-
-	e=$(echo "$d" | grep "Link detected" | awk -F: '{printf $2}' | sed 's/^[ \t]*//g')
-	if [ $e = yes ]; then
-		l=1
-	else
-		l=0
-	fi
-
-	f=$(echo "$d" | grep "Speed" | awk -F: '{printf $2}' | sed 's/^[ \t]*//g' | tr -d "Unknown!")
-	[ -z "$f" ] && f=" - "
-
-	g=$(echo "$d" | grep "Duplex" | awk -F: '{printf $2}' | sed 's/^[ \t]*//g')
-	if [ "$g" == "Full" ]; then
-		x=1
-	else
-		x=0
-	fi
-
-	echo -n "$h \"$c\", \"status\": $l, \"speed\": \"$f\", \"duplex\": $x}," >> /tmp/state/ethinfo
-done
-
-sed -i 's/.$//' /tmp/state/ethinfo
-
-echo -n "]" >> /tmp/state/ethinfo
-
-cat /tmp/state/ethinfo
+#!/usr/bin/lua
+-- Copyright (C) 2022 Tianling Shen <[email protected]>
+
+local util = require "luci.util"
+local jsonc = require "luci.jsonc"
+
+local eth_info = {}
+local ifname, stat
+for ifname, stat in pairs(util.ubus("network.device", "status")) do
+	if ifname:match("^(eth%d+)$") == ifname then
+		local status, speed, duplex
+
+		status = stat.carrier and 1 or 0
+
+		if stat.speed:sub(1, 1) == "-" then
+			speed = " - "
+		else
+			speed = stat.speed:sub(1, -2) .. "Mb/s"
+		end
+
+		if stat.carrier and stat.speed:sub(-1) == "F" then
+			duplex = 1
+		else
+			duplex = 0
+		end
+
+		eth_info[#eth_info+1] = { name = ifname, status = status,
+					speed = speed, duplex = duplex }
+	end
+end
+
+table.sort(eth_info,
+	function(a, b)
+		return a.name < b.name
+	end)
+
+print(jsonc.stringify(eth_info))

package/network/utils/umbim/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umbim
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/umbim.git
@@ -34,7 +34,7 @@ define Package/umbim/description
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include -ffunction-sections -fdata-sections
+	-I$(STAGING_DIR)/usr/include -ffunction-sections -fdata-sections -Wno-address-of-packed-member
 
 TARGET_LDFLAGS += -Wl,--gc-sections