expose system_if_apply_settings, make it ignore the mac address for external devices

diff --git a/system-dummy.c b/system-dummy.c
index a2411f32998c9aae6a05ccba65897c1a1be26fd7..f77d9c685d70b35e9ab33496c70e2c4027e2435d 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -119,6 +119,11 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
        return 0;
 }
 
+void
+system_if_apply_settings(struct device *dev, struct device_settings *s)
+{
+}
+
 int system_add_address(struct device *dev, struct device_addr *addr)
 {
        uint8_t *a = (uint8_t *) &addr->addr.in;

diff --git a/system-linux.c b/system-linux.c
index d2e3d0625f56f32e62fcf79917fffabab204cac3..b3b58bea557df328f54f53e39fd06575a086a1a5 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -632,7 +632,7 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
        }
 }
 
-static void
+void
 system_if_apply_settings(struct device *dev, struct device_settings *s)
 {
        struct ifreq ifr;
@@ -649,7 +649,7 @@ system_if_apply_settings(struct device *dev, struct device_settings *s)
                if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
                        s->flags &= ~DEV_OPT_TXQUEUELEN;
        }
-       if (s->flags & DEV_OPT_MACADDR) {
+       if ((s->flags & DEV_OPT_MACADDR) && !dev->external) {
                ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
                memcpy(&ifr.ifr_hwaddr.sa_data, s->macaddr, sizeof(s->macaddr));
                if (ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr) < 0)

diff --git a/system.h b/system.h
index 5e275cad6000595169c1acaef85e934cb8348868..701e44a89ca7c2357d8b96556bcfa865a846ed26 100644 (file)
--- a/system.h
+++ b/system.h
@@ -67,6 +67,8 @@ int system_if_dump_info(struct device *dev, struct blob_buf *b);
 int system_if_dump_stats(struct device *dev, struct blob_buf *b);
 struct device *system_if_get_parent(struct device *dev);
 bool system_if_force_external(const char *ifname);
+void system_if_apply_settings(struct device *dev, struct device_settings *s);
+
 
 int system_add_address(struct device *dev, struct device_addr *addr);
 int system_del_address(struct device *dev, struct device_addr *addr);