X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=0ff2b3b344d742c0beb457a4bbd11c1e6ae53974;hp=2150c448b693718498ec7545d1df4dfec0f592a5;hb=91fa29a0d17b40963f67f08e740ca0a07365db90;hpb=c85a502081ef76aef0a9e9fb9af65257c2e415a2;ds=sidebyside

diff --git a/system-linux.c b/system-linux.c
index 2150c44..0ff2b3b 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -570,31 +570,30 @@ int system_vlan_del(struct device *dev)
 }
 
 static void
-system_if_apply_settings(struct device *dev)
+system_if_apply_settings(struct device *dev, struct device_settings *s)
 {
 	struct ifreq ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
-	if (dev->flags & DEV_OPT_MTU) {
-		ifr.ifr_mtu = dev->mtu;
+	if (s->flags & DEV_OPT_MTU) {
+		ifr.ifr_mtu = s->mtu;
 		ioctl(sock_ioctl, SIOCSIFMTU, &ifr);
 	}
-	if (dev->flags & DEV_OPT_TXQUEUELEN) {
-		ifr.ifr_qlen = dev->txqueuelen;
+	if (s->flags & DEV_OPT_TXQUEUELEN) {
+		ifr.ifr_qlen = s->txqueuelen;
 		ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr);
 	}
-	if (dev->flags & DEV_OPT_MACADDR) {
-		memcpy(&ifr.ifr_hwaddr, dev->macaddr, sizeof(dev->macaddr));
+	if (s->flags & DEV_OPT_MACADDR) {
+		memcpy(&ifr.ifr_hwaddr, s->macaddr, sizeof(s->macaddr));
 		ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr);
 	}
-
-	dev->ifindex = system_if_resolve(dev);
 }
 
 int system_if_up(struct device *dev)
 {
-	system_if_apply_settings(dev);
+	system_if_apply_settings(dev, &dev->settings);
+	dev->ifindex = system_if_resolve(dev);
 	return system_if_flags(dev->ifname, IFF_UP, 0);
 }