netifd: Check interface state only when main device is set during interface_change_config

[project/netifd.git] / system.h

diff --git a/system.h b/system.h
index 9b555e8..1ad861a 100644 (file)
--- a/system.h
+++ b/system.h
@@ -25,13 +25,16 @@ enum tunnel_param {
        TUNNEL_ATTR_TYPE,
        TUNNEL_ATTR_REMOTE,
        TUNNEL_ATTR_LOCAL,
        TUNNEL_ATTR_TYPE,
        TUNNEL_ATTR_REMOTE,
        TUNNEL_ATTR_LOCAL,

+       TUNNEL_ATTR_MTU,
+       TUNNEL_ATTR_DF,

        TUNNEL_ATTR_TTL,
        TUNNEL_ATTR_6RD_PREFIX,
        TUNNEL_ATTR_6RD_RELAY_PREFIX,
        TUNNEL_ATTR_TTL,
        TUNNEL_ATTR_6RD_PREFIX,
        TUNNEL_ATTR_6RD_RELAY_PREFIX,

+       TUNNEL_ATTR_LINK,

        __TUNNEL_ATTR_MAX
 };
 
        __TUNNEL_ATTR_MAX
 };
 

-const struct config_param_list tunnel_attr_list;
+const struct uci_blob_param_list tunnel_attr_list;

 
 enum bridge_opt {
        /* stp and forward delay always set */
 
 enum bridge_opt {
        /* stp and forward delay always set */


@@ -44,13 +47,26 @@ struct bridge_config {
        enum bridge_opt flags;
        bool stp;
        bool igmp_snoop;
        enum bridge_opt flags;
        bool stp;
        bool igmp_snoop;

+       unsigned short priority;

        int forward_delay;
        int forward_delay;

+       bool bridge_empty;

 
        int ageing_time;
        int hello_time;
        int max_age;
 };
 
 
        int ageing_time;
        int hello_time;
        int max_age;
 };
 

+enum macvlan_opt {
+       MACVLAN_OPT_MACADDR = (1 << 0),
+};
+
+struct macvlan_config {
+       const char *mode;
+
+       enum macvlan_opt flags;
+       unsigned char macaddr[6];
+};
+

 static inline int system_get_addr_family(unsigned int flags)
 {
        if ((flags & DEVADDR_FAMILY) == DEVADDR_INET6)
 static inline int system_get_addr_family(unsigned int flags)
 {
        if ((flags & DEVADDR_FAMILY) == DEVADDR_INET6)


@@ -74,6 +90,9 @@ int system_bridge_delbr(struct device *bridge);
 int system_bridge_addif(struct device *bridge, struct device *dev);
 int system_bridge_delif(struct device *bridge, struct device *dev);
 
 int system_bridge_addif(struct device *bridge, struct device *dev);
 int system_bridge_delif(struct device *bridge, struct device *dev);
 

+int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvlan_config *cfg);
+int system_macvlan_del(struct device *macvlan);
+

 int system_vlan_add(struct device *dev, int id);
 int system_vlan_del(struct device *dev);
 
 int system_vlan_add(struct device *dev, int id);
 int system_vlan_del(struct device *dev);
 


@@ -85,8 +104,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);
 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);
-
+void system_if_apply_settings(struct device *dev, struct device_settings *s,
+                             unsigned int apply_mask);

 
 int system_add_address(struct device *dev, struct device_addr *addr);
 int system_del_address(struct device *dev, struct device_addr *addr);
 
 int system_add_address(struct device *dev, struct device_addr *addr);
 int system_del_address(struct device *dev, struct device_addr *addr);