From patchwork Thu Dec 11 19:29:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Thibault X-Patchwork-Id: 420239 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A998514009B for ; Fri, 12 Dec 2014 06:29:44 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5152E281079; Thu, 11 Dec 2014 20:27:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 776392800B8 for ; Thu, 11 Dec 2014 20:27:43 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_FROM_MX=-3.1; rate: -7.6 Received: from mail.navigue.com (mail.navigue.com [74.117.40.3]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 11 Dec 2014 20:27:42 +0100 (CET) Received: from [192.168.7.190] (unknown [74.117.40.10]) by mail.navigue.com (Postfix) with ESMTP id 8FF311A018C for ; Thu, 11 Dec 2014 14:29:25 -0500 (EST) Message-ID: <5489F095.5040100@navigue.com> Date: Thu, 11 Dec 2014 14:29:25 -0500 From: Jonathan Thibault User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH] enable vlan filtering. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This is quite useful when you want to encapsulate l2 into a vpn and other things of that nature. I've called the package containing the 'bridge' command bridge2 (from iproute2) to avoid conflicting with old package 'bridge' which should really be called 'bridge-utils' and which provides 'brctl'. It could be called 'iproute2-bridge' or something else, I'll let maintainers decide what is best. Maybe since brctl is now provided by busybox, there's no real need for the original 'bridge' package. diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index fc85e22..542462b 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -86,7 +86,8 @@ define KernelPackage/bridge DEPENDS:=+kmod-stp KCONFIG:= \ CONFIG_BRIDGE \ - CONFIG_BRIDGE_IGMP_SNOOPING=y + CONFIG_BRIDGE_IGMP_SNOOPING=y \ + CONFIG_BRIDGE_VLAN_FILTERING=y FILES:=$(LINUX_DIR)/net/bridge/bridge.ko AUTOLOAD:=$(call AutoLoad,11,bridge) endef diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index fc47159..98cc8fd 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -53,6 +53,11 @@ $(call Package/iproute2/Default) TITLE:=General netlink utility frontend endef +define Package/bridge2 +$(call Package/iproute2/Default) + TITLE:=Bridge configuration utility +endef + define Package/ss $(call Package/iproute2/Default) TITLE:=Socket statistics utility @@ -122,6 +127,11 @@ define Package/genl/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/ endef +define Package/bridge2/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bridge/bridge $(1)/usr/sbin/ +endef + define Package/ss/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/ @@ -131,4 +141,5 @@ $(eval $(call BuildPackage,ip)) $(eval $(call BuildPackage,ip-full)) $(eval $(call BuildPackage,tc)) $(eval $(call BuildPackage,genl)) +$(eval $(call BuildPackage,bridge2)) $(eval $(call BuildPackage,ss))