remove an unnecessary check

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index 4fa0ead..aa3aeda 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -602,15 +602,18 @@ system_if_apply_settings(struct device *dev, struct device_settings *s)
        strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
        if (s->flags & DEV_OPT_MTU) {
                ifr.ifr_mtu = s->mtu;
-               ioctl(sock_ioctl, SIOCSIFMTU, &ifr);
+               if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0)
+                       s->flags &= ~DEV_OPT_MTU;
        }
        if (s->flags & DEV_OPT_TXQUEUELEN) {
                ifr.ifr_qlen = s->txqueuelen;
-               ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr);
+               if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
+                       s->flags &= ~DEV_OPT_TXQUEUELEN;
        }
        if (s->flags & DEV_OPT_MACADDR) {
                memcpy(&ifr.ifr_hwaddr, s->macaddr, sizeof(s->macaddr));
-               ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr);
+               if (ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr) < 0)
+                       s->flags &= ~DEV_OPT_MACADDR;
        }
 }
 
@@ -746,8 +749,6 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 
        if (read_int_file(dir_fd, "carrier", &val))
                blobmsg_add_u8(b, "link", !!val);
-       if (read_string_file(dir_fd, "address", buf, sizeof(buf)))
-               blobmsg_add_string(b, "macaddr", buf);
 
        memset(&ecmd, 0, sizeof(ecmd));
        memset(&ifr, 0, sizeof(ifr));