swconfig: Add cpu port index to help output.
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@gmail.com> SVN-Revision: 20939
This commit is contained in:
parent
e1079c515a
commit
f7cc3d576c
5 changed files with 6 additions and 1 deletions
|
@ -74,7 +74,7 @@ print_attrs(const struct switch_attr *attr)
|
|||
static void
|
||||
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);
|
||||
printf(" --vlan\n");
|
||||
|
|
|
@ -586,6 +586,8 @@ add_switch(struct nl_msg *msg, void *arg)
|
|||
dev->ports = nla_get_u32(tb[SWITCH_ATTR_PORTS]);
|
||||
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) {
|
||||
sa->head = dev;
|
||||
|
|
|
@ -118,6 +118,7 @@ struct switch_dev {
|
|||
const char *dev_name;
|
||||
int ports;
|
||||
int vlans;
|
||||
int cpu_port;
|
||||
struct switch_attr *ops;
|
||||
struct switch_attr *port_ops;
|
||||
struct switch_attr *vlan_ops;
|
||||
|
|
|
@ -761,6 +761,7 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
|
|||
NLA_PUT_STRING(msg, SWITCH_ATTR_DEV_NAME, dev->devname);
|
||||
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);
|
||||
nla_put_failure:
|
||||
|
|
|
@ -40,6 +40,7 @@ enum {
|
|||
SWITCH_ATTR_DEV_NAME,
|
||||
SWITCH_ATTR_VLANS,
|
||||
SWITCH_ATTR_PORTS,
|
||||
SWITCH_ATTR_CPU_PORT,
|
||||
/* attributes */
|
||||
SWITCH_ATTR_OP_ID,
|
||||
SWITCH_ATTR_OP_TYPE,
|
||||
|
|
Loading…
Reference in a new issue