interface-ip: DNS name server sorting support in resolv.conf.auto

[project/netifd.git] / system.h

diff --git a/system.h b/system.h
index 94e0dd9..d5cb4e3 100644 (file)
--- a/system.h
+++ b/system.h
@@ -37,20 +37,30 @@ enum tunnel_param {
        __TUNNEL_ATTR_MAX
 };
 
-const struct uci_blob_param_list tunnel_attr_list;
+extern const struct uci_blob_param_list tunnel_attr_list;
 
 enum bridge_opt {
        /* stp and forward delay always set */
-       BRIDGE_OPT_AGEING_TIME = (1 << 0),
-       BRIDGE_OPT_HELLO_TIME  = (1 << 1),
-       BRIDGE_OPT_MAX_AGE     = (1 << 2),
+       BRIDGE_OPT_AGEING_TIME             = (1 << 0),
+       BRIDGE_OPT_HELLO_TIME              = (1 << 1),
+       BRIDGE_OPT_MAX_AGE                 = (1 << 2),
+       BRIDGE_OPT_ROBUSTNESS              = (1 << 3),
+       BRIDGE_OPT_QUERY_INTERVAL          = (1 << 4),
+       BRIDGE_OPT_QUERY_RESPONSE_INTERVAL = (1 << 5),
+       BRIDGE_OPT_LAST_MEMBER_INTERVAL    = (1 << 6),
 };
 
 struct bridge_config {
        enum bridge_opt flags;
        bool stp;
+
        bool igmp_snoop;
        bool multicast_querier;
+       int robustness;
+       int query_interval;
+       int query_response_interval;
+       int last_member_interval;
+
        unsigned short priority;
        int forward_delay;
        bool bridge_empty;
@@ -58,6 +68,7 @@ struct bridge_config {
        int ageing_time;
        int hello_time;
        int max_age;
+       int hash_max;
 };
 
 enum macvlan_opt {
@@ -91,7 +102,7 @@ static inline int system_get_addr_family(unsigned int flags)
 
 static inline int system_get_addr_len(unsigned int flags)
 {
-       if ((flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+       if ((flags & DEVADDR_FAMILY) != DEVADDR_INET6)
                return sizeof(struct in_addr);
        else
                return sizeof(struct in6_addr);
@@ -113,6 +124,7 @@ int system_vlan_del(struct device *dev);
 int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlandev_config *cfg);
 int system_vlandev_del(struct device *vlandev);
 
+void system_if_get_settings(struct device *dev, struct device_settings *s);
 void system_if_clear_state(struct device *dev);
 int system_if_up(struct device *dev);
 int system_if_down(struct device *dev);