swconfig: backport compatibility fix from r27820

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27821 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index c0a228a6972e4d9819f4439f38dd6abaf9561ca8..91939bb73f4c33cef83c924b3d591732507f5542 100644 (file)
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swconfig
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swconfig

-PKG_RELEASE:=8
+PKG_RELEASE:=9

 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system

-  DEPENDS:=@LINUX_2_6 @!TARGET_brcm47xx +libuci +libnl-tiny
+  DEPENDS:=@!TARGET_brcm47xx +libuci +libnl-tiny

   TITLE:=Switch configuration utility
 endef
 
   TITLE:=Switch configuration utility
 endef
 

diff --git a/package/swconfig/src/uci.c b/package/swconfig/src/uci.c
index ce544c3d58b76b4429bcfb164f0deacf705f08b3..1de689ce6e3e303641a36a273064ccf5257044be 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,7 +177,7 @@ 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;


@@ -196,7 +202,7 @@ 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;