netifd: fix disabling radio via config if reconf is being used

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index 88cce9ad6552a5d43cc18c4788a207f4e2fef761..aa4da183d925be4bbd84608c308611564e7eb1f5 100644 (file)
--- a/device.h
+++ b/device.h
@@ -62,6 +62,7 @@ enum {
        DEV_ATTR_AUTH,
        DEV_ATTR_SPEED,
        DEV_ATTR_DUPLEX,
+       DEV_ATTR_VLAN,
        __DEV_ATTR_MAX,
 };
 
@@ -205,6 +206,10 @@ struct device_settings {
        bool duplex;
 };
 
+struct device_vlan_range {
+       uint16_t start, end;
+};
+
 /*
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -219,7 +224,7 @@ struct device {
        struct vlist_tree vlans;
        struct kvlist vlan_aliases;
 
-       char ifname[IFNAMSIZ + 1];
+       char ifname[IFNAMSIZ];
        int ifindex;
 
        struct blob_attr *config;
@@ -243,10 +248,13 @@ struct device {
        bool default_config;
        bool wireless;
        bool wireless_ap;
+       bool wireless_proxyarp;
        bool wireless_isolate;
        bool bpdu_filter;
 
        struct interface *config_iface;
+       struct device_vlan_range *extra_vlan;
+       int n_extra_vlan;
 
        /* set interface up or down */
        device_state_cb set_state;
@@ -299,9 +307,6 @@ extern const struct uci_blob_param_list device_attr_list;
 extern struct device_type simple_device_type;
 extern struct device_type tunnel_device_type;
 
-void device_lock(void);
-void device_unlock(void);
-
 void device_vlan_update(bool done);
 void device_stp_init(void);
 
@@ -345,7 +350,7 @@ void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
 void device_dump_status(struct blob_buf *b, struct device *dev);
 
-void device_free_unused(struct device *dev);
+void device_free_unused(void);
 
 struct device *get_vlan_device_chain(const char *ifname, int create);
 void alias_notify_device(const char *name, struct device *dev);