Changeset 20948

Timestamp:

2010-04-16T22:30:06+02:00 (8 years ago)

Author:

juhosg

Message:

backfire: swconfig: Add cpu port index to help output. (backport of 20939)

Let swconfig provide the cpu port index in its help page. This is
needed as e.g. Atheros switches have their cpu port at port 0, not
port 5.

This could allow e.g. luci to get a rough overview of the layout of
the switch.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@…>

Location:

branches/backfire

Files:

• package/swconfig/src/cli.c (modified) (1 diff)
• package/swconfig/src/swlib.c (modified) (1 diff)
• package/swconfig/src/swlib.h (modified) (1 diff)
• target/linux/generic-2.6/files/drivers/net/phy/swconfig.c (modified) (1 diff)
• target/linux/generic-2.6/files/include/linux/switch.h (modified) (1 diff)

branches/backfire/package/swconfig/src/cli.c

@@ -75 +75 @@
 list_attributes(struct switch_dev *dev)
 {
-        printf("Switch %d: %s(%s), ports: %d, vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->vlans);
+        printf("Switch %d: %s(%s), ports: %d (cpu @ %d), vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->cpu_port, dev->vlans);
         printf("     --switch\n");
         print_attrs(dev->ops);

branches/backfire/package/swconfig/src/swlib.c

@@ -587 +587 @@
         if (tb[SWITCH_ATTR_VLANS])
                 dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
+        if (tb[SWITCH_ATTR_CPU_PORT])
+                dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]);
 
         if (!sa->head) {

branches/backfire/package/swconfig/src/swlib.h

@@ -119 +119 @@
         int ports;
         int vlans;
+        int cpu_port;
         struct switch_attr *ops;
         struct switch_attr *port_ops;

branches/backfire/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c

@@ -758 +758 @@
         NLA_PUT_U32(msg, SWITCH_ATTR_VLANS, dev->vlans);
         NLA_PUT_U32(msg, SWITCH_ATTR_PORTS, dev->ports);
+        NLA_PUT_U32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port);
 
         return genlmsg_end(msg, hdr);

branches/backfire/target/linux/generic-2.6/files/include/linux/switch.h

@@ -41 +41 @@
         SWITCH_ATTR_VLANS,
         SWITCH_ATTR_PORTS,
+        SWITCH_ATTR_CPU_PORT,
         /* attributes */
         SWITCH_ATTR_OP_ID,