brcm47xx: initial 2.6.39 support for brcm47xx

[openwrt.git] / package / swconfig / src / cli.c

diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index 7e77bd2..eea88d8 100644 (file)
--- a/package/swconfig/src/cli.c
+++ b/package/swconfig/src/cli.c
@@ -74,7 +74,7 @@ print_attrs(const struct switch_attr *attr)
 static void
 list_attributes(struct switch_dev *dev)
 {
 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");
        printf("     --switch\n");
        print_attrs(dev->ops);
        printf("     --vlan\n");


@@ -196,8 +196,6 @@ int main(int argc, char **argv)
        int err;
        int i;
 
        int err;
        int i;
 

-       struct switch_port *ports;
-

        int cmd = CMD_NONE;
        char *cdev = NULL;
        int cport = -1;
        int cmd = CMD_NONE;
        char *cdev = NULL;
        int cport = -1;


@@ -255,8 +253,6 @@ int main(int argc, char **argv)
                return 1;
        }
 
                return 1;
        }
 

-       ports = malloc(sizeof(struct switch_port) * dev->ports);
-       memset(ports, 0, sizeof(struct switch_port) * dev->ports);

        swlib_scan(dev);
 
        if (cmd == CMD_GET || cmd == CMD_SET) {
        swlib_scan(dev);
 
        if (cmd == CMD_GET || cmd == CMD_SET) {


@@ -329,7 +325,5 @@ int main(int argc, char **argv)
 
 out:
        swlib_free_all(dev);
 
 out:
        swlib_free_all(dev);

-       free(ports);
-

        return 0;
 }
        return 0;
 }