X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4eb3ce394ee2c5208c856646f05b96cc7484c0e4..7196f4da13523994b276518dd12fbe8edfdfff56:/package/ppp/files/pppoe.sh

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index 86bddddf5..e1c9a20cd 100644
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -6,16 +6,19 @@ setup_interface_pppoe() {
 	local iface="$1"
 	local config="$2"
 	
-	config_get device "$config" device
-
 	for module in slhc ppp_generic pppox pppoe; do
 		/sbin/insmod $module 2>&- >&-
 	done
 
+	# make sure the network state references the correct ifname
+	scan_ppp "$config"
+	config_get ifname "$config" ifname
+	set_interface_ifname "$config" "$ifname"
+
 	config_get mtu "$cfg" mtu
 	mtu=${mtu:-1492}
 	start_pppd "$config" \
 		plugin rp-pppoe.so \
 		mtu $mtu mru $mtu \
-		"nic-$device"
+		"nic-$iface"
 }