kernel: update linux 3.2 to 3.2.12

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

diff --git a/package/swconfig/src/uci.c b/package/swconfig/src/uci.c
index ce544c3..893e3d1 100644 (file)
--- a/package/swconfig/src/uci.c
+++ b/package/swconfig/src/uci.c
@@ -53,6 +53,12 @@ struct swlib_setting early_settings[] = {
 static struct swlib_setting *settings;
 static struct swlib_setting **head;
 
 static struct swlib_setting *settings;
 static struct swlib_setting **head;
 

+static bool swlib_match_name(struct switch_dev *dev, const char *name)
+{
+       return (strcmp(name, dev->dev_name) == 0 ||
+               strcmp(name, dev->alias) == 0);
+}
+

 static int
 swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s)
 {
 static int
 swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s)
 {


@@ -131,13 +137,13 @@ int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
                        if (o->type != UCI_TYPE_STRING)
                                continue;
 
                        if (o->type != UCI_TYPE_STRING)
                                continue;
 

-                       if (!strcmp(o->v.string, dev->dev_name))
+                       if (swlib_match_name(dev, o->v.string))

                                goto found;
 
                        break;
                }
 
                                goto found;
 
                        break;
                }
 

-               if (strcmp(e->name, dev->dev_name) != 0)
+               if (!swlib_match_name(dev, e->name))

                        continue;
 
                goto found;
                        continue;
 
                goto found;


@@ -171,13 +177,13 @@ found:
 
                                if (!strcmp(os->name, "device")) {
                                        devn = o->v.string;
 
                                if (!strcmp(os->name, "device")) {
                                        devn = o->v.string;

-                                       if (strcmp(devn, dev->dev_name) != 0)
+                                       if (!swlib_match_name(dev, devn))

                                                devn = NULL;
                                } else if (!strcmp(os->name, "port")) {
                                        port = o->v.string;
                                }
                        }
                                                devn = NULL;
                                } else if (!strcmp(os->name, "port")) {
                                        port = o->v.string;
                                }
                        }

-                       if (!dev || !port || !port[0])
+                       if (!devn || !port || !port[0])

                                continue;
 
                        port_n = strtoul(port, &port_err, 0);
                                continue;
 
                        port_n = strtoul(port, &port_err, 0);


@@ -196,13 +202,13 @@ found:
 
                                if (!strcmp(os->name, "device")) {
                                        devn = o->v.string;
 
                                if (!strcmp(os->name, "device")) {
                                        devn = o->v.string;

-                                       if (strcmp(devn, dev->dev_name) != 0)
+                                       if (!swlib_match_name(dev, devn))

                                                devn = NULL;
                                } else if (!strcmp(os->name, "vlan")) {
                                        vlan = o->v.string;
                                }
                        }
                                                devn = NULL;
                                } else if (!strcmp(os->name, "vlan")) {
                                        vlan = o->v.string;
                                }
                        }

-                       if (!dev || !vlan || !vlan[0])
+                       if (!devn || !vlan || !vlan[0])

                                continue;
 
                        vlan_n = strtoul(vlan, &vlan_err, 0);
                                continue;
 
                        vlan_n = strtoul(vlan, &vlan_err, 0);