diff --git a/bridgemngr/Config.in b/bridgemngr/Config.in index 0858e1295..4c7bec466 100644 --- a/bridgemngr/Config.in +++ b/bridgemngr/Config.in @@ -5,6 +5,12 @@ config BRIDGEMNGR_BRIDGE_VLAN help Set this option to use bridge-vlan as backend for VLAN objects. +config BRIDGEMNGR_COPY_PBITS + bool "Copy pbits from cvlan to svlan" + default y + help + Set this option to copy cvlan pbits to svlan pbits by default (driver vlan). + config BRIDGEMNGR_BRIDGE_VENDOR_EXT bool "Use bridge BBF vendor extensions" default y diff --git a/bridgemngr/Makefile b/bridgemngr/Makefile index 6cd15d5aa..81746f033 100644 --- a/bridgemngr/Makefile +++ b/bridgemngr/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bridgemngr -PKG_VERSION:=1.1.4 +PKG_VERSION:=1.1.5 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr.git -PKG_SOURCE_VERSION:=e5e0d9adfc919c25d88a867d42a9c500cb09f834 +PKG_SOURCE_VERSION:=9f48c27a472d01ee39ef531d1b676402bf02820b PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif @@ -51,6 +51,10 @@ ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y) TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND endif +ifeq ($(CONFIG_BRIDGEMNGR_COPY_PBITS),y) + TARGET_CFLAGS+=-DBRIDGEMNGR_COPY_PBITS +endif + define Package/bridgemngr/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config