From patchwork Sat Dec 23 19:06:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mukhin X-Patchwork-Id: 852684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fErpG6jW"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z3vxq17N0z9s83 for ; Sun, 24 Dec 2017 06:06:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F413889618; Sat, 23 Dec 2017 19:06:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o3jgKgjx4iCQ; Sat, 23 Dec 2017 19:06:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A856893D9; Sat, 23 Dec 2017 19:06:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A0DDF1C098D for ; Sat, 23 Dec 2017 19:06:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A6AB893DB for ; Sat, 23 Dec 2017 19:06:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qe8uTlf9WoMs for ; Sat, 23 Dec 2017 19:06:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id BED27893CD for ; Sat, 23 Dec 2017 19:06:42 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id u84so14687705lff.7 for ; Sat, 23 Dec 2017 11:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GccH9/E3/yTo2mlUFQYgnJUyPNryWeY/v4uh8ypUBPY=; b=fErpG6jW0Lr35rcm7VffK49fDK6BmdBaMKWnFkmPaNRlwznT/vp06aAYVyLTF7qDsp H91BkEWH38wIx2PnqxEHb9LC7sX2k/iBEyeFViN5vbKCc12ejh+kFnOMasT8PC4358IM hmwEhMJ0Dg+Q8lkDkzQTJAD7Wc1MMOVeDkXyFrs5vz8dly9VDd7AzSkAxPDl6WPku+Gx +kQP4icsFJhQ9BHPd94O/4U6Xo+iKQglaa7N5MYKpcpU8QmxetVs6VbHDQWAb3gbcid7 m5g81jCTJloaAGHyk9akbZxTurvlRzYdU2B9HjcSswfZy4+GTY4IXbHRwEFwV17bkiAP pZWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GccH9/E3/yTo2mlUFQYgnJUyPNryWeY/v4uh8ypUBPY=; b=Gv3ThPVmfWZgCLoE8/Ft823sVINJHBK2MaLg1zqZ2n6A6/RRRst6j0CW726ii4LdkE Nxx8SH0sDgk+hfYJ5snPFWRE3tCHnh2uLBMVWYg8Tk4TyMGxANnqFWvlEr5AgWTzuwP0 dXp2uzjGcR1JlKZetizOMR0bq8iulIuZQVAPMXi2vd5pVX+RS3aybEEmuhBA2QOotHer 9UuoGwiaQA8WidEfHSH/sR1EMqGcHhz++OLqF/lzvMs496xNbxRheMr1f+giZkvYqg58 0Vw1MmpgR2a+OKmiSiwdi0kv56sxegOjWnjNJFPRUz6VpRPGozbtLTpkj61vU8yA8qo+ NGuw== X-Gm-Message-State: AKGB3mJlDYcoW8PHPxcCrDmRucp8gtkB4w8kG/4W4plpYlkbUcmLUpCs T1STLEMy65fQxBk7G3FCL5+tNg== X-Google-Smtp-Source: ACJfBouHoiU7fsIhO9f+4f+YmPcGBrmbTdGli7WyJ6mBqoo3QtmMWXm0qjXRQoHDapZXNPlrMTcY2Q== X-Received: by 10.25.168.79 with SMTP id r76mr494892lfe.63.1514056000797; Sat, 23 Dec 2017 11:06:40 -0800 (PST) Received: from localhost.localdomain ([2a00:1838:30:a00:626d:c7ff:fecc:a711]) by smtp.gmail.com with ESMTPSA id g12sm229038lfd.32.2017.12.23.11.06.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 11:06:40 -0800 (PST) From: Alexander Mukhin To: buildroot@busybox.net Date: Sat, 23 Dec 2017 22:06:14 +0300 Message-Id: <20171223190617.3981-2-alexander.i.mukhin@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171223190617.3981-1-alexander.i.mukhin@gmail.com> References: <20171223190617.3981-1-alexander.i.mukhin@gmail.com> Subject: [Buildroot] [PATCH 1/4] hostapd: select VLAN support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Mukhin MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add configuration options for hostapd to select which kind of VLAN support to build. Signed-off-by: Alexander Mukhin --- package/hostapd/Config.in | 23 +++++++++++++++++++++++ package/hostapd/hostapd.mk | 16 +++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 40c7015e73..84156e8f11 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -43,6 +43,29 @@ config BR2_PACKAGE_HOSTAPD_WPS help Enable support for Wi-Fi Protected Setup. +config BR2_PACKAGE_HOSTAPD_VLAN + bool "Enable VLAN support" + default y + help + Enable support for VLANs. + +config BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC + bool "Enable dynamic VLAN support" + default y + depends on BR2_PACKAGE_HOSTAPD_VLAN + help + Enable support for fully dynamic VLANs. + This enables hostapd to automatically create + bridge and VLAN interfaces if necessary. + +config BR2_PACKAGE_HOSTAPD_VLAN_NETLINK + bool "Use netlink-based API for VLAN operations" + default y + depends on BR2_PACKAGE_HOSTAPD_VLAN + help + Use netlink-based kernel API for VLAN operations + instead of ioctl(). + endif comment "hostapd needs a toolchain w/ threads" diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 0ed1631421..04ffa35758 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -18,15 +18,13 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ - CONFIG_FULL_DYNAMIC_VLAN \ CONFIG_HS20 \ CONFIG_IEEE80211AC \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ CONFIG_INTERNAL_LIBTOMMATH \ CONFIG_INTERWORKING \ - CONFIG_LIBNL32 \ - CONFIG_VLAN_NETLINK + CONFIG_LIBNL32 HOSTAPD_CONFIG_DISABLE = @@ -74,6 +72,18 @@ ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y) HOSTAPD_CONFIG_ENABLE += CONFIG_WPS endif +ifneq ($(BR2_PACKAGE_HOSTAPD_VLAN),y) +HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN +endif + +ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) +HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN +endif + +ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) +HOSTAPD_CONFIG_ENABLE += CONFIG_VLAN_NETLINK +endif + define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \