diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-10-03 23:39:31 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-10-03 23:39:31 +0000 |
| commit | 36770e53c1aa489241dc285ba011c89d0bd7f135 (patch) | |
| tree | a14b4dd6723fe3e1ace5aa1849d8a55c963b8a08 /package/swconfig | |
| parent | 86734b743c816990a8d6de98f2a6b02828494453 (diff) | |
| download | upstream-36770e53c1aa489241dc285ba011c89d0bd7f135.tar.gz upstream-36770e53c1aa489241dc285ba011c89d0bd7f135.tar.bz2 upstream-36770e53c1aa489241dc285ba011c89d0bd7f135.zip | |
swconfig: fix vlan/port configs being applied to all switches
Check devn instead of dev (which will never be null at this point).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28362 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/swconfig')
| -rw-r--r-- | package/swconfig/Makefile | 2 | ||||
| -rw-r--r-- | package/swconfig/src/uci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 91939bb73f..099058e5f0 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=swconfig -PKG_RELEASE:=9 +PKG_RELEASE:=10 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk diff --git a/package/swconfig/src/uci.c b/package/swconfig/src/uci.c index 1de689ce6e..893e3d1dd8 100644 --- a/package/swconfig/src/uci.c +++ b/package/swconfig/src/uci.c @@ -183,7 +183,7 @@ found: port = o->v.string; } } - if (!dev || !port || !port[0]) + if (!devn || !port || !port[0]) continue; port_n = strtoul(port, &port_err, 0); @@ -208,7 +208,7 @@ found: vlan = o->v.string; } } - if (!dev || !vlan || !vlan[0]) + if (!devn || !vlan || !vlan[0]) continue; vlan_n = strtoul(vlan, &vlan_err, 0); |