From a3ec9b262df6f1399cb5c0587e04724d83e7dcf0 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 21 Mar 2021 00:18:20 +0100 Subject: [PATCH] luci-mod-network: fix legacy bridge configuration Ref: https://github.com/openwrt/luci/pull/4307#issuecomment-803432603 Fixes: faad7464a8 ("luci-mod-network: add support for network.device sections") Signed-off-by: Jo-Philipp Wich (cherry picked from commit edf640af583de122b020d215aadd141028c9458f) --- .../htdocs/luci-static/resources/tools/network.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js index 2ca28ee950..66d4eae9e2 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js @@ -53,16 +53,6 @@ function deviceSectionExists(section_id, devname) { exists = exists || (ss['.name'] != section_id && ss.name == devname /* && !ss.type*/); }); - /* Until http://lists.openwrt.org/pipermail/openwrt-devel/2020-July/030397.html lands, - prevent redeclaring interface bridges */ - if (!exists) { - var m = devname.match(/^br-([A-Za-z0-9_]+)$/), - s = m ? uci.get('network', m[1]) : null; - - if (s && s['.type'] == 'interface' && s.type == 'bridge') - exists = true; - } - return exists; } -- 2.30.2