Merge pull request #1223 from pony1k/issue/1222

fix: wifi interfaces do not always get deconfigured correctly

Author: a-gave

packages/lime-system/files/usr/lib/lua/lime/network.lua

@@ -264,13 +264,8 @@ function network.scandevices(specificIfaces)
 		end
 
 		if dev:match("^eth%d+$") then
-			--! We only get here with devices not listed in board.json, e.g
-			--! pluggable ethernet dongles.
 			utils.log( "network.scandevices.dev_parser found plain Ethernet " ..
 			           "device %s", dev )
-		elseif dev:match("^wlan%d+"..wireless.WIFI_MODE_SEPARATOR().."%w+$") then
-			utils.log( "network.scandevices.dev_parser found WiFi device %s",
-			           dev )
 		elseif specificIfaces[dev] then
 			utils.log( "network.scandevices.dev_parser found device %s that " ..
 			           "matches the config net section %s", dev,
@@ -285,11 +280,13 @@ function network.scandevices(specificIfaces)
 	end
 
 	function owrt_ifname_parser(section)
-		local ifn = section["ifname"]
-		if ( type(ifn) == "string" ) then
+		local dev = section["ifname"]
+		if ( type(dev) == "string" ) then
+			local is_dsa = utils.is_dsa(dev)
+			devices[dev] = devices[dev] or {}
+			devices[dev]["dsa"] = is_dsa
 			utils.log( "network.scandevices.owrt_ifname_parser found ifname %s",
-			           ifn )
-			dev_parser(ifn)
+			           dev )
 		end
 	end
 
@@ -298,10 +295,11 @@ function network.scandevices(specificIfaces)
 		devices[dev] = devices[dev] or {}
 		devices[dev]["dsa"] = is_dsa
 		if is_dsa then
-			utils.log( "network.scandevices found DSA-port %s in board.json",
-			           dev )
+			utils.log( "network.scandevices.board_port_parser found " ..
+			           "DSA-port %s in board.json", dev )
 		else
-			utils.log( "network.scandevices found device %s in board.json", dev )
+			utils.log( "network.scandevices.board_port_parser found " ..
+			           "device %s in board.json", dev )
 		end
 	end