SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

kernel/swconfig: remove obsolete portmapping feature from swconfig

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2016-08-12 14:51:59 +02:00
parent 63f6fc5c16
commit 675407baa4
5 changed files with 1 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
target/linux/generic/files/drivers/net/phy/swconfig.c
View File

@@ -915,9 +915,7 @@ static int
swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
const struct switch_dev *dev)
{
struct nlattr *p = NULL, *m = NULL;
void *hdr;
int i;
hdr = genlmsg_put(msg, pid, seq, &switch_fam, flags,
SWITCH_CMD_NEW_ATTR);
@@ -939,24 +937,6 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
if (nla_put_u32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port))
goto nla_put_failure;
m = nla_nest_start(msg, SWITCH_ATTR_PORTMAP);
if (!m)
goto nla_put_failure;
for (i = 0; i < dev->ports; i++) {
p = nla_nest_start(msg, SWITCH_ATTR_PORTS);
if (!p)
continue;
if (dev->portmap[i].s) {
if (nla_put_string(msg, SWITCH_PORTMAP_SEGMENT,
dev->portmap[i].s))
goto nla_put_failure;
if (nla_put_u32(msg, SWITCH_PORTMAP_VIRT,
dev->portmap[i].virt))
goto nla_put_failure;
}
nla_nest_end(msg, p);
}
nla_nest_end(msg, m);
genlmsg_end(msg, hdr);
return msg->len;
nla_put_failure:
@@ -1049,51 +1029,6 @@ static struct genl_ops swconfig_ops[] = {
}
};
#ifdef CONFIG_OF
void
of_switch_load_portmap(struct switch_dev *dev)
{
struct device_node *port;
if (!dev->of_node)
return;
for_each_child_of_node(dev->of_node, port) {
const __be32 *prop;
const char *segment;
int size, phys;
if (!of_device_is_compatible(port, "swconfig,port"))
continue;
if (of_property_read_string(port, "swconfig,segment", &segment))
continue;
prop = of_get_property(port, "swconfig,portmap", &size);
if (!prop)
continue;
if (size != (2 * sizeof(*prop))) {
pr_err("%s: failed to parse port mapping\n",
port->name);
continue;
}
phys = be32_to_cpup(prop++);
if ((phys < 0) | (phys >= dev->ports)) {
pr_err("%s: physical port index out of range\n",
port->name);
continue;
}
dev->portmap[phys].s = kstrdup(segment, GFP_KERNEL);
dev->portmap[phys].virt = be32_to_cpup(prop);
pr_debug("Found port: %s, physical: %d, virtual: %d\n",
segment, phys, dev->portmap[phys].virt);
}
}
#endif
int
register_switch(struct switch_dev *dev, struct net_device *netdev)
{
@@ -1116,12 +1051,6 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
dev->ports, GFP_KERNEL);
if (!dev->portbuf)
return -ENOMEM;
dev->portmap = kzalloc(sizeof(struct switch_portmap) *
dev->ports, GFP_KERNEL);
if (!dev->portmap) {
kfree(dev->portbuf);
return -ENOMEM;
}
}
swconfig_defaults_init(dev);
mutex_init(&dev->sw_mutex);
@@ -1143,11 +1072,6 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
return -ENFILE;
}
#ifdef CONFIG_OF
if (dev->ports)
of_switch_load_portmap(dev);
#endif
/* fill device name */
snprintf(dev->devname, IFNAMSIZ, SWCONFIG_DEVNAME, i);