KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

swconfig: add a generic method for setting the port primary vlan id (used for transparently fixing up pvid for untagged port when setting vlan ports)

Browse source 
SVN-Revision: 15307
This commit is contained in:
Felix Fietkau 2009-04-20 21:26:39 +00:00
parent 4320a28228
commit f6f55bae7d
2 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
View file

@ -75,6 +75,7 @@ swconfig_get_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr,
static int static int
swconfig_set_vlan_ports(struct switch_dev *dev, const 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; int i;
if (val->port_vlan >= dev->vlans) if (val->port_vlan >= dev->vlans)
@ -84,17 +85,44 @@ swconfig_set_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr,
if (val->len > dev->ports) if (val->len > dev->ports)
return -EINVAL; return -EINVAL;
for (i = 0; i < val->len; i++) {
if (val->value.ports[i].id >= dev->ports)
return -EINVAL;
}
if (!dev->set_vlan_ports) if (!dev->set_vlan_ports)
return -EOPNOTSUPP; return -EOPNOTSUPP;
for (i = 0; i < val->len; i++) {
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);
}
return dev->set_vlan_ports(dev, val); 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;
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 static int
swconfig_apply_config(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) swconfig_apply_config(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
{ {
@ -115,7 +143,7 @@ enum vlan_defaults {
}; };
enum port_defaults { enum port_defaults {
PORT_LINK, PORT_PVID,
}; };
static struct switch_attr default_global[] = { static struct switch_attr default_global[] = {
@ -128,10 +156,12 @@ static struct switch_attr default_global[] = {
}; };
static struct switch_attr default_port[] = { static struct switch_attr default_port[] = {
[PORT_LINK] = { [PORT_PVID] = {
.type = SWITCH_TYPE_INT, .type = SWITCH_TYPE_INT,
.name = "link", .name = "pvid",
.description = "Current link speed", .description = "Primary VLAN ID",
.set = swconfig_set_pvid,
.get = swconfig_get_pvid,
} }
}; };
@ -155,6 +185,9 @@ static void swconfig_defaults_init(struct switch_dev *dev)
if (dev->get_vlan_ports || dev->set_vlan_ports) if (dev->get_vlan_ports || dev->set_vlan_ports)
set_bit(VLAN_PORTS, &dev->def_vlan); 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 */ /* always present, can be no-op */
set_bit(GLOBAL_APPLY, &dev->def_global); set_bit(GLOBAL_APPLY, &dev->def_global);
} }

2
target/linux/generic-2.6/files/include/linux/switch.h
View file

@ -129,6 +129,8 @@ struct switch_dev {
int (*get_vlan_ports)(struct switch_dev *dev, struct switch_val *val); int (*get_vlan_ports)(struct switch_dev *dev, struct switch_val *val);
int (*set_vlan_ports)(struct switch_dev *dev, struct switch_val *val); int (*set_vlan_ports)(struct switch_dev *dev, struct switch_val *val);
int (*get_port_pvid)(struct switch_dev *dev, int port, int *val);
int (*set_port_pvid)(struct switch_dev *dev, int port, int val);
int (*apply_config)(struct switch_dev *dev); int (*apply_config)(struct switch_dev *dev);
}; };