wireless: clean up prev_config handling

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index 4f80caa870ffe767b9633157d0d1ac7cd68d975a..14d7486b7317799e2a431e01c826b9c0fdb0728a 100644 (file)
--- a/device.h
+++ b/device.h
@@ -62,6 +62,12 @@ enum {
        DEV_ATTR_AUTH,
        DEV_ATTR_SPEED,
        DEV_ATTR_DUPLEX,
+       DEV_ATTR_VLAN,
+       DEV_ATTR_PAUSE,
+       DEV_ATTR_ASYM_PAUSE,
+       DEV_ATTR_RXPAUSE,
+       DEV_ATTR_TXPAUSE,
+       DEV_ATTR_AUTONEG,
        __DEV_ATTR_MAX,
 };
 
@@ -126,6 +132,11 @@ enum {
        DEV_OPT_ARP_ACCEPT              = (1ULL << 29),
        DEV_OPT_SPEED                   = (1ULL << 30),
        DEV_OPT_DUPLEX                  = (1ULL << 31),
+       DEV_OPT_PAUSE                   = (1ULL << 32),
+       DEV_OPT_ASYM_PAUSE              = (1ULL << 33),
+       DEV_OPT_RXPAUSE                 = (1ULL << 34),
+       DEV_OPT_TXPAUSE                 = (1ULL << 35),
+       DEV_OPT_AUTONEG                 = (1ULL << 36),
 };
 
 /* events broadcasted to all users of a device */
@@ -203,6 +214,15 @@ struct device_settings {
        bool auth;
        unsigned int speed;
        bool duplex;
+       bool pause;
+       bool asym_pause;
+       bool rxpause;
+       bool txpause;
+       bool autoneg;
+};
+
+struct device_vlan_range {
+       uint16_t start, end;
 };
 
 /*
@@ -219,7 +239,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,9 +263,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;
@@ -298,9 +322,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);
 
@@ -344,7 +365,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);