rtl8366: make it available on all platforms

[openwrt.git] / target / linux / generic-2.6 / files / drivers / net / phy / swconfig.c

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
index ade2842..7207e46 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
@@ -59,7 +59,7 @@ struct swconfig_callback
 /* defaults */
 
 static int
-swconfig_get_vlan_ports(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+swconfig_get_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
 {
        int ret;
        if (val->port_vlan >= dev->vlans)
@@ -69,13 +69,13 @@ swconfig_get_vlan_ports(struct switch_dev *dev, struct switch_attr *attr, struct
                return -EOPNOTSUPP;
 
        ret = dev->get_vlan_ports(dev, val);
-       printk("SET PORTS %d\n", val->len);
        return ret;
 }
 
 static int
-swconfig_set_vlan_ports(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+swconfig_set_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
 {
+       struct switch_port *ports = val->value.ports;
        int i;
 
        if (val->port_vlan >= dev->vlans)
@@ -85,20 +85,46 @@ swconfig_set_vlan_ports(struct switch_dev *dev, struct switch_attr *attr, struct
        if (val->len > dev->ports)
                return -EINVAL;
 
+       if (!dev->set_vlan_ports)
+               return -EOPNOTSUPP;
+
        for (i = 0; i < val->len; i++) {
-               if (val->value.ports[i].id >= dev->ports)
+               if (ports[i].id >= dev->ports)
                        return -EINVAL;
+
+               if (dev->set_port_pvid && !(ports[i].flags & SWITCH_PORT_FLAG_TAGGED))
+                       dev->set_port_pvid(dev, ports[i].id, val->port_vlan);
        }
 
-       if (!dev->set_vlan_ports)
+       return dev->set_vlan_ports(dev, val);
+}
+
+static int
+swconfig_set_pvid(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+       if (val->port_vlan >= dev->ports)
+               return -EINVAL;
+
+       if (!dev->set_port_pvid)
                return -EOPNOTSUPP;
 
-       printk("SET PORTS %d\n", val->len);
-       return dev->set_vlan_ports(dev, val);
+       return dev->set_port_pvid(dev, val->port_vlan, val->value.i);
+}
+
+static int
+swconfig_get_pvid(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+       if (val->port_vlan >= dev->ports)
+               return -EINVAL;
+
+       if (!dev->get_port_pvid)
+               return -EOPNOTSUPP;
+
+       return dev->get_port_pvid(dev, val->port_vlan, &val->value.i);
 }
 
 static int
-swconfig_apply_config(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+swconfig_apply_config(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
 {
        /* don't complain if not supported by the switch driver */
        if (!dev->apply_config)
@@ -107,9 +133,19 @@ swconfig_apply_config(struct switch_dev *dev, struct switch_attr *attr, struct s
        return dev->apply_config(dev);
 }
 
+static int
+swconfig_reset_switch(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+       /* don't complain if not supported by the switch driver */
+       if (!dev->reset_switch)
+               return 0;
+
+       return dev->reset_switch(dev);
+}
 
 enum global_defaults {
        GLOBAL_APPLY,
+       GLOBAL_RESET,
 };
 
 enum vlan_defaults {
@@ -117,7 +153,7 @@ enum vlan_defaults {
 };
 
 enum port_defaults {
-       PORT_LINK,
+       PORT_PVID,
 };
 
 static struct switch_attr default_global[] = {
@@ -126,14 +162,22 @@ static struct switch_attr default_global[] = {
                .name = "apply",
                .description = "Activate changes in the hardware",
                .set = swconfig_apply_config,
+       },
+       [GLOBAL_RESET] = {
+               .type = SWITCH_TYPE_NOVAL,
+               .name = "reset",
+               .description = "Reset the switch",
+               .set = swconfig_reset_switch,
        }
 };
 
 static struct switch_attr default_port[] = {
-       [PORT_LINK] = {
+       [PORT_PVID] = {
                .type = SWITCH_TYPE_INT,
-               .name = "link",
-               .description = "Current link speed",
+               .name = "pvid",
+               .description = "Primary VLAN ID",
+               .set = swconfig_set_pvid,
+               .get = swconfig_get_pvid,
        }
 };
 
@@ -157,8 +201,12 @@ static void swconfig_defaults_init(struct switch_dev *dev)
        if (dev->get_vlan_ports || dev->set_vlan_ports)
                set_bit(VLAN_PORTS, &dev->def_vlan);
 
+       if (dev->get_port_pvid || dev->set_port_pvid)
+               set_bit(PORT_PVID, &dev->def_port);
+
        /* always present, can be no-op */
        set_bit(GLOBAL_APPLY, &dev->def_global);
+       set_bit(GLOBAL_RESET, &dev->def_global);
 }
 
 
@@ -352,7 +400,7 @@ swconfig_list_attrs(struct sk_buff *skb, struct genl_info *info)
                if (alist->attr[i].disabled)
                        continue;
                cb.args[0] = i;
-               err = swconfig_send_multipart(&cb, &alist->attr[i]);
+               err = swconfig_send_multipart(&cb, (void *) &alist->attr[i]);
                if (err < 0)
                        goto error;
        }
@@ -362,7 +410,7 @@ swconfig_list_attrs(struct sk_buff *skb, struct genl_info *info)
                if (!test_bit(i, def_active))
                        continue;
                cb.args[0] = SWITCH_ATTR_DEFAULTS_OFFSET + i;
-               err = swconfig_send_multipart(&cb, &def_list[i]);
+               err = swconfig_send_multipart(&cb, (void *) &def_list[i]);
                if (err < 0)
                        goto error;
        }
@@ -381,13 +429,13 @@ out:
        return err;
 }
 
-static struct switch_attr *
+static const struct switch_attr *
 swconfig_lookup_attr(struct switch_dev *dev, struct genl_info *info,
                struct switch_val *val)
 {
        struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
        const struct switch_attrlist *alist;
-       struct switch_attr *attr = NULL;
+       const struct switch_attr *attr = NULL;
        int attr_id;
 
        /* defaults */
@@ -492,7 +540,7 @@ swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
 static int
 swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
 {
-       struct switch_attr *attr;
+       const struct switch_attr *attr;
        struct switch_dev *dev;
        struct switch_val val;
        int err = -EINVAL;
@@ -622,7 +670,7 @@ static int
 swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
 {
        struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-       struct switch_attr *attr;
+       const struct switch_attr *attr;
        struct switch_dev *dev;
        struct sk_buff *msg = NULL;
        struct switch_val val;