From 2230fe39229364f71b982acebedab0579f8b4165 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 27 Sep 2020 23:35:11 +0200 Subject: ramips: remove set_wifi_led function in 01_leds While we mostly use the ucidef_set_led_* functions directly in 01_leds we still have the set_wifi_led function in parallel for several old devices. This is not only inconsistent with the other definitions, it also links to the wlan0 interface instead of using a phy trigger which would be independent of the interface name (and is used for all newer devices anyway). Apart from that, the standard names "wifi" and "wifi-led" are not very helpful in a world with different radio bands either. Thus, this patch removes the set_wifi_led function and puts the relevant commands into the cases explicitly. This makes the mechanism used more evident and will hopefully lead to some future improvements or at least prevent some copy-pasting of the old setups. Signed-off-by: Adrian Schmutzler --- .../ramips/rt305x/base-files/etc/board.d/01_leds | 32 ++++++++++------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'target/linux/ramips/rt305x') diff --git a/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds b/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds index 449f003df1..1796ae50d8 100755 --- a/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds @@ -3,10 +3,6 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - board=$(board_name) board_config_update @@ -15,13 +11,13 @@ case $board in 7links,px-4885-4m|\ 7links,px-4885-8m|\ fon,fonera-20n) - set_wifi_led "orange:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "orange:wifi" "wlan0" ;; airlive,air3gii|\ aximcom,mr-102n|\ edimax,3g-6200nl|\ netgear,wnce2001) - set_wifi_led "green:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; alfa-network,w502u|\ dlink,dir-300-b1|\ @@ -40,7 +36,7 @@ tenda,w306r-v2|\ zyxel,keenetic-start|\ zyxel,keenetic|\ zyxel,nbg-419n-v2) - set_wifi_led "rt2800pci-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800pci-phy0::radio" "wlan0" ;; allnet,all0256n-4m|\ allnet,all0256n-8m) @@ -48,48 +44,48 @@ allnet,all0256n-8m) ucidef_set_led_rssi "rssilow" "RSSILOW" "green:rssilow" "wlan0" "1" "40" "0" "6" ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "green:rssimed" "wlan0" "30" "80" "-29" "5" ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "70" "100" "-69" "8" - set_wifi_led "rt2800pci-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800pci-phy0::radio" "wlan0" ;; alphanetworks,asl26555-8m|\ alphanetworks,asl26555-16m) ucidef_set_led_netdev "eth" "ETH" "green:eth" "eth0" - set_wifi_led "green:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; asiarf,awapn2403) - set_wifi_led "rt2800soc-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800soc-phy0::radio" "wlan0" ;; dlink,dcs-930l-b1) ucidef_set_led_netdev "wifi" "WiFi" "blue:wps" ;; dlink,dir-615-d) ucidef_set_led_netdev "wan" "WAN (green)" "green:wan" "eth0.2" - set_wifi_led "rt2800soc-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800soc-phy0::radio" "wlan0" ;; dlink,dir-620-d1|\ trendnet,tew-714tru) - set_wifi_led "green:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; edimax,3g-6200n|\ planex,mzk-w300nh2) - set_wifi_led "amber:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "amber:wlan" "wlan0" ;; hauppauge,broadway) - set_wifi_led "red:wps_active" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wps_active" "wlan0" ;; hootoo,ht-tm02) ucidef_set_led_netdev "eth" "Ethernet" "green:lan" "eth0" - set_wifi_led "blue:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wlan" "wlan0" ;; huawei,hg255d) - set_wifi_led "green:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ucidef_set_led_netdev "internet" "internet" "green:internet" "eth0.2" ;; intenso,memory2move) - set_wifi_led "blue:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wifi" "wlan0" ucidef_set_led_netdev "eth" "Ethernet" "green:wan" "eth0" ;; omnima,miniembplug) - set_wifi_led "red:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wlan" "wlan0" ;; vocore,vocore-8m|\ vocore,vocore-16m) -- cgit v1.2.3