aboutsummaryrefslogtreecommitdiffstats
path: root/package/netifd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-04 01:05:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-04 01:05:12 +0000
commit1e20e3114ab8430b18bb0b9fd59df0b267256587 (patch)
tree838374943559d3b936fd643260835e59c568473f /package/netifd
parentbbb6f7a82df22bbdaed1b4515229f1e234ab14cd (diff)
downloadupstream-1e20e3114ab8430b18bb0b9fd59df0b267256587.tar.gz
upstream-1e20e3114ab8430b18bb0b9fd59df0b267256587.tar.bz2
upstream-1e20e3114ab8430b18bb0b9fd59df0b267256587.zip
netifd: ensure that a bridge gets created before hostapd needs it, hostapd must not attempt to create the bridge by itself
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28745 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/netifd')
-rw-r--r--package/netifd/Makefile4
-rwxr-xr-xpackage/netifd/files/lib/network/config.sh7
2 files changed, 9 insertions, 2 deletions
diff --git a/package/netifd/Makefile b/package/netifd/Makefile
index 465acd4122..98b4a4044f 100644
--- a/package/netifd/Makefile
+++ b/package/netifd/Makefile
@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netifd
-PKG_VERSION:=2011-11-03
+PKG_VERSION:=2011-11-04
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5c0c0bb557b17c581d4f238c52b0b44ada34a608
+PKG_SOURCE_VERSION:=b6d7a8bc9822667cb851bec465c3ad7cd6714e90
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
# PKG_MIRROR_MD5SUM:=
# CMAKE_INSTALL:=1
diff --git a/package/netifd/files/lib/network/config.sh b/package/netifd/files/lib/network/config.sh
index 778c964e7b..4ce362eb19 100755
--- a/package/netifd/files/lib/network/config.sh
+++ b/package/netifd/files/lib/network/config.sh
@@ -40,6 +40,13 @@ scan_interfaces() {
config_foreach fixup_interface interface
}
+prepare_interface_bridge() {
+ local config="$1"
+
+ [ -n "$config" ] || return 0
+ ubus call network.interface."$config" prepare
+}
+
setup_interface() {
local iface="$1"
local config="$2"