net: ar8216: address security vulnerabilities in swconfig & ar8216

[openwrt/staging/wigyori.git] / target / linux / generic / files / include / linux / switch.h

diff --git a/target/linux/generic/files/include/linux/switch.h b/target/linux/generic/files/include/linux/switch.h
index a381fd006c4417eab3a86acac5578e220b1fbc20..f8380b98c56687810816025f63f4e062b69e6f06 100644 (file)
--- a/target/linux/generic/files/include/linux/switch.h
+++ b/target/linux/generic/files/include/linux/switch.h
@@ -105,6 +105,7 @@ struct switch_dev_ops {
 };
 
 struct switch_dev {
+       struct device_node *of_node;
        const struct switch_dev_ops *ops;
        /* will be automatically filled */
        char devname[IFNAMSIZ];
@@ -114,17 +115,18 @@ struct switch_dev {
        const char *alias;
        struct net_device *netdev;
 
-       int ports;
-       int vlans;
-       int cpu_port;
+       unsigned int ports;
+       unsigned int vlans;
+       unsigned int cpu_port;
 
        /* the following fields are internal for swconfig */
-       int id;
+       unsigned int id;
        struct list_head dev_list;
        unsigned long def_global, def_port, def_vlan;
 
        struct mutex sw_mutex;
        struct switch_port *portbuf;
+       struct switch_portmap *portmap;
        struct switch_port_link linkbuf;
 
        char buf[128];
@@ -139,10 +141,15 @@ struct switch_port {
        u32 flags;
 };
 
+struct switch_portmap {
+       u32 virt;
+       const char *s;
+};
+
 struct switch_val {
        const struct switch_attr *attr;
-       int port_vlan;
-       int len;
+       unsigned int port_vlan;
+       unsigned int len;
        union {
                const char *s;
                u32 i;