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)) \ From patchwork Sat Dec 23 19:06:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mukhin X-Patchwork-Id: 852683 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.136; helo=silver.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="iTclCyPw"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z3vxm51d0z9sBZ for ; Sun, 24 Dec 2017 06:06:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BEA332DEBA; Sat, 23 Dec 2017 19:06:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9CP+375KpLkN; Sat, 23 Dec 2017 19:06:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B75062DB85; Sat, 23 Dec 2017 19:06:48 +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 9E87B1C098D for ; Sat, 23 Dec 2017 19:06:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B025893D9 for ; Sat, 23 Dec 2017 19:06:44 +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 dZ2eH+kb4WuR for ; Sat, 23 Dec 2017 19:06:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6E5EE893CC for ; Sat, 23 Dec 2017 19:06:43 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id w196so16698706lff.5 for ; Sat, 23 Dec 2017 11:06:43 -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=/gmc9BJnekdSP+9hhNf3HKL+WufFsRfcfGzf1XNxlto=; b=iTclCyPwgyzVtAqs9mokXXHFw4CZ7nhD8w3nE5aud0esmajg8v5GI6bVI4mGtmDXbp ELpkKLok6I/JaBM4gGzDgoMxDod0SZ3wCnEWayRTXXfTEk5Z7SXl0YRpOxG9i9q4UvN+ d2VaM2+zxfFCTvz+IjIG1NVQ84zAWn7s9nXjGvuGetNnsRp8kD+JvbTuBZer9AWzOBLW kEDXSu3vmr95Peha/2udrAxlm93pz2gVqPFqUNMN8wSZW0ljm1zIFwO90+vzQCb7+eH8 8oTCfgN8JaBSYTONytEmKZj/X9DCjflJeRKhqmifEsa1ah+b+u7/CtYlgWezC7EjFCDi oqjg== 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=/gmc9BJnekdSP+9hhNf3HKL+WufFsRfcfGzf1XNxlto=; b=TLX9LOM6o7E4fFF/Uk9dGp0+mBP/nMH1uU4HscVi0UCE180nl+LT1NcfG0gioxIlmZ tCt5+WFZY/uKATzVJ9QXKzxhMvpwBrgfltkx8BA5VkMTCqMz/lT1W76va2kIpwCHRy2O CREzwZTWC8FfmTB/Fd/Q4VqVxRG6qvmQehdXP1ArQNmElV9gvJdGugsKVuZ5UqmO7tbP UizhxkwGEgjr+BNv5u/BZ0Myot0MFb2zv9EQXYKwAYg8UscAK+COEX0Tm8k9Cr6/BZbu PTEQVkmjU7c8bf/+JMXoCXqBzL6FBiTJg+IHHP5iX9UxPJsCw79+Hc/gBwQFHLdYbFpM qlfA== X-Gm-Message-State: AKGB3mK8P6FTqj4nlQ6kVeOp7R46P3BSCHsnmrP3ifHI0ISexRPPXHFk xCgAQZOh4uPIbjqw1kduAZlCBg== X-Google-Smtp-Source: ACJfBot/tGXrlMwbyl0JyR9VthHJnz74+8V57hRiIWD0sPwp6vMnGUVwl7jBsVV90kqw+maGirEijA== X-Received: by 10.25.156.136 with SMTP id f130mr2819490lfe.0.1514056001513; Sat, 23 Dec 2017 11:06:41 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 11:06:41 -0800 (PST) From: Alexander Mukhin To: buildroot@busybox.net Date: Sat, 23 Dec 2017 22:06:15 +0300 Message-Id: <20171223190617.3981-3-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 2/4] hostapd: select driver 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 drivers to build. Signed-off-by: Alexander Mukhin --- package/hostapd/Config.in | 17 +++++++++++++++++ package/hostapd/hostapd.mk | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 84156e8f11..509797a44a 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -14,11 +14,28 @@ config BR2_PACKAGE_HOSTAPD if BR2_PACKAGE_HOSTAPD +config BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP + bool "Enable hostap driver" + default y + help + Enable support for Host AP driver. + +config BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 + bool "Enable nl80211 driver" + default y + help + Enable support for drivers using the nl80211 kernel interface. + config BR2_PACKAGE_HOSTAPD_DRIVER_RTW bool "Enable rtl871xdrv driver" help Enable support for Realtek wireless chips. +comment "at least one driver must be selected" + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_RTW + config BR2_PACKAGE_HOSTAPD_ACS bool "Enable ACS" default y diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 04ffa35758..143efe9627 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -45,6 +45,14 @@ HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif +ifneq ($(BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP),y) +HOSTAPD_CONFIG_DISABLE += CONFIG_DRIVER_HOSTAP +endif + +ifneq ($(BR2_PACKAGE_HOSTAPD_DRIVER_NL80211),y) +HOSTAPD_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 +endif + ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y) HOSTAPD_PATCH += https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch HOSTAPD_CONFIG_SET += CONFIG_DRIVER_RTW From patchwork Sat Dec 23 19:06:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mukhin X-Patchwork-Id: 852686 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.137; helo=fraxinus.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="DFWFJcdN"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z3vxr4F34z9s83 for ; Sun, 24 Dec 2017 06:06:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68BCA84CE0; Sat, 23 Dec 2017 19:06:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7dG0-E7cxT-h; Sat, 23 Dec 2017 19:06:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B17A784CCC; Sat, 23 Dec 2017 19:06:50 +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 108691C098D for ; Sat, 23 Dec 2017 19:06:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C5C1893DB for ; Sat, 23 Dec 2017 19:06:45 +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 oNZsiaqQvCGo for ; Sat, 23 Dec 2017 19:06:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 44EBF893CD for ; Sat, 23 Dec 2017 19:06:44 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id g80so30205112lfg.0 for ; Sat, 23 Dec 2017 11:06:44 -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=hwvh7c2yDzsq5oFwkFhB160NCzeC33B9bc2MMFubHpI=; b=DFWFJcdN8xB9eoBsQPceQfHtJ5R5Oribe9npJGkHk0FATtxKSOVSYvIcv0wDB/yLOm MzhbQIQfeb69jqGaf1bt12OMHxLoIyxxvYmBDMPQJ2vJ3/sPe2U+jSW4v3oImE+rvyss KDP4jbG4CUuhPX/H9KB2uie2ExMUpmE6QJNt07csuHBT4xm8JSurRI4Zx8wityl7BJgS EooUr5WO1+7TLBfn5w3jISosqN3zkNFJVSas5dOC5Kr5u1qOzzdVpO+kCsXmt8DQZxEL 0daYS4GuWQiobx5QtcQFNhGUC71U1w1Xip0kMVZAbwGC7JhstuiVm//wCiOVY0ksKZKB FuwA== 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=hwvh7c2yDzsq5oFwkFhB160NCzeC33B9bc2MMFubHpI=; b=mvpuK+BYeUhfOqIjhhqTnwZmpUExR6HnSHDBgt+Bf1VqXTFItKzenmjA7kzExTiI0W owVa1wKEwTcwKI76xrjyICgjHT9pgKxef/kjxdbSz5HLJRRA5kLlqyvQTEmWX00qw4jj gFh1S3e6hYNTp2wmdRT68PeTxkLHH/beGs0umU65nXBB3byP9UqNXKDtqMzdFhTZ8MwE utHgRRH+jtyKJZ9/QB+S7R6xFrZAHusZUhIHZGcMsFEfjZpFBVA8irMEQiqAxrU/rJ+J saJoJIxg6W/11audQ30I1WVoL0RPVwt7/ntoJPnbwCC/z/+/n/kcEqLXl4O6luuVYU2+ arkw== X-Gm-Message-State: AKGB3mJAFV9c3W+QdobQ/eW6Tv/zrxc14DracduHSoZmghw6ZSPpHD8/ U9a0iMvsOQjHTPpa6kr8xgRxOA== X-Google-Smtp-Source: ACJfBouwkogBb44CPGtK2sPJrK9YaC9Lx0A+x2OQikmNK+ftabHobinpFsjrJRN1DXC6+JTHXdg/Fg== X-Received: by 10.46.57.10 with SMTP id g10mr10721580lja.77.1514056002243; Sat, 23 Dec 2017 11:06:42 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 11:06:41 -0800 (PST) From: Alexander Mukhin To: buildroot@busybox.net Date: Sat, 23 Dec 2017 22:06:16 +0300 Message-Id: <20171223190617.3981-4-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 3/4] hostapd: make ACS dependent on nl80211 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" ACS is supported for nl80211 driver only. Signed-off-by: Alexander Mukhin --- package/hostapd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 509797a44a..57cec469c6 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -39,6 +39,7 @@ comment "at least one driver must be selected" config BR2_PACKAGE_HOSTAPD_ACS bool "Enable ACS" default y + depends on BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 help Enable support for standard ACS (Automatic Channel Selection). Some propietary drivers use a custom algorithm which requires @@ -46,6 +47,9 @@ config BR2_PACKAGE_HOSTAPD_ACS causing hostapd to use the standard one which doesn't work for those cases. +comment "ACS is currently only supported through the nl80211 driver" + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 + config BR2_PACKAGE_HOSTAPD_EAP bool "Enable EAP" depends on !BR2_STATIC_LIBS From patchwork Sat Dec 23 19:06:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mukhin X-Patchwork-Id: 852685 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="MF/dYv+8"; 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 3z3vxr0Jwtz9sBZ for ; Sun, 24 Dec 2017 06:06:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A19FC814A3; Sat, 23 Dec 2017 19:06:53 +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 xckU1KK44zPo; Sat, 23 Dec 2017 19:06:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7AED581153; Sat, 23 Dec 2017 19:06:51 +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 51EBE1C098D for ; Sat, 23 Dec 2017 19:06:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C730893E1 for ; Sat, 23 Dec 2017 19:06:46 +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 ikQhNHYlULmx for ; Sat, 23 Dec 2017 19:06:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id E990D893CC for ; Sat, 23 Dec 2017 19:06:44 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id f13so34632108lff.12 for ; Sat, 23 Dec 2017 11:06:44 -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=pWAQsHGIpSz1Kb3OVvogUeuEz5hTKfgSlT44PYb2FQU=; b=MF/dYv+8GAE6n1I6iXIIB8g2k1M7XtnblQG3sBhpONUFsy9An7Y2HHPltFZEAqoHqm 7lyAFaTx+wq2lRVaVHqmt2E8raEKhYrD8ZWMK1uazotxnv3HZQgMqX/gzWnLTRPa0Uv2 yHtgPNtciWNXhnWQ6Gfv/aWxwnd5Y/pXqKUt0BvUmaWv1Lw3TLQ5f7AFrmwpfmdr2QP2 A3XfNHHA82PqDxDUTj1BZijI8pooLFP0XaEj7OKUdTUBX/8syTPYG9LkSijbHj+osG4m Z3PvzVpO05LcSNngkpL/yw0+pXBcrjKp7nTEY/MhEZjzNliCaugyIUG+hiXJePeddACf rLRw== 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=pWAQsHGIpSz1Kb3OVvogUeuEz5hTKfgSlT44PYb2FQU=; b=Q6LKle/8+3rDJ/bKX7IbnbHteL5PgMWl3oU3r77ulz6gQF3xfdhwbMgELg5YurePvO Yhg+L+BkXHOwtlZW7iLomDTnIv6R8GvqNCkTW6+Lr/EkFSDXs9udkFQ0RBV5QVmc3CcT 3tlcnBCNI2P4XLhI5KLdWV3uoAbcTh0gHWsDTWhR/Qv21ImVYerkopSBd/GPt2qZofG/ 73WXduTz8swmOX8hTNjyN+ri/eI+Wot9qhwCupuX3QzyX5P7o0pt21fIy0qyAfSzUs2J OpfFFyuZCmn2U4zC4uIsCsP7TghTcaq+7jGvd91kUVclRqLlByoWS4vUemE+UnX2f2at 34tw== X-Gm-Message-State: AKGB3mLbZol6yPgRU7Qmu93TtekPSP7sbjG/TNF2O9XrcSTpzTLM3c8f 7iJOEs+RVj5GBTJiSpPlfjzj2A== X-Google-Smtp-Source: ACJfBouTiE0/wdc7MGn1vf9UOONNQW39wKeJeafDZ+7HgUuusQHsrLn119gA+QA0soKDENPl0s88yA== X-Received: by 10.46.92.135 with SMTP id q129mr2322393ljb.88.1514056003050; Sat, 23 Dec 2017 11:06:43 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 11:06:42 -0800 (PST) From: Alexander Mukhin To: buildroot@busybox.net Date: Sat, 23 Dec 2017 22:06:17 +0300 Message-Id: <20171223190617.3981-5-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 4/4] hostapd: drop default netlink dependency 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" Get rid of netlink and threads dependency if the options selected allow so. Signed-off-by: Alexander Mukhin --- package/hostapd/Config.in | 16 ++++++++++------ package/hostapd/hostapd.mk | 29 +++++++++++++++++++---------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 57cec469c6..115563f564 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_HOSTAPD bool "hostapd" - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBNL help User space daemon for wireless access points. @@ -23,9 +21,14 @@ config BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP config BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 bool "Enable nl80211 driver" default y + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL help Enable support for drivers using the nl80211 kernel interface. +comment "nl80211 driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_HOSTAPD_DRIVER_RTW bool "Enable rtl871xdrv driver" help @@ -83,12 +86,13 @@ config BR2_PACKAGE_HOSTAPD_VLAN_NETLINK bool "Use netlink-based API for VLAN operations" default y depends on BR2_PACKAGE_HOSTAPD_VLAN + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL help Use netlink-based kernel API for VLAN operations instead of ioctl(). -endif - -comment "hostapd needs a toolchain w/ threads" +comment "netlink-based VLAN support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU + +endif diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 143efe9627..9b73c596f8 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -11,8 +11,8 @@ HOSTAPD_PATCH = \ http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config -HOSTAPD_DEPENDENCIES = host-pkgconf libnl -HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ +HOSTAPD_DEPENDENCIES = host-pkgconf +HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause HOSTAPD_LICENSE_FILES = README HOSTAPD_CONFIG_SET = @@ -23,17 +23,11 @@ HOSTAPD_CONFIG_ENABLE = \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_INTERWORKING \ - CONFIG_LIBNL32 + CONFIG_INTERWORKING HOSTAPD_CONFIG_DISABLE = -# libnl-3 needs -lm (for rint) and -lpthread if linking statically -# And library order matters hence stick -lnl-3 first since it's appended -# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing -ifeq ($(BR2_STATIC_LIBS),y) -HOSTAPD_LIBS += -lnl-3 -lm -lpthread -endif +HOSTAPD_USE_NL = # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) @@ -51,6 +45,8 @@ endif ifneq ($(BR2_PACKAGE_HOSTAPD_DRIVER_NL80211),y) HOSTAPD_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 +else +HOSTAPD_USE_NL = y endif ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y) @@ -89,9 +85,22 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) +HOSTAPD_USE_NL = y HOSTAPD_CONFIG_ENABLE += CONFIG_VLAN_NETLINK endif +ifeq ($(HOSTAPD_USE_NL),y) +HOSTAPD_DEPENDENCIES += libnl +HOSTAPD_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/ +HOSTAPD_CONFIG_ENABLE += CONFIG_LIBNL32 +# libnl-3 needs -lm (for rint) and -lpthread if linking statically +# And library order matters hence stick -lnl-3 first since it's appended +# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing +ifeq ($(BR2_STATIC_LIBS),y) +HOSTAPD_LIBS += -lnl-3 -lm -lpthread +endif +endif + define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \