From patchwork Wed Nov 16 00:30:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 125901 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id B86C5B6FF5 for ; Wed, 16 Nov 2011 11:30:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 47A1317C020; Tue, 15 Nov 2011 19:30:34 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NosW2wxyURKR; Tue, 15 Nov 2011 19:30:34 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 289A617C017; Tue, 15 Nov 2011 19:30:23 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id C056F17C017 for ; Tue, 15 Nov 2011 19:30:21 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hsd2qH4qxV6t for ; Tue, 15 Nov 2011 19:30:14 -0500 (EST) Received: from ns3.lanforge.com (mail.candelatech.com [208.74.158.172]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id C577017C009 for ; Tue, 15 Nov 2011 19:30:14 -0500 (EST) Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id pAG0U7rC020651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 15 Nov 2011 16:30:07 -0800 From: greearb@candelatech.com To: hostap@lists.shmoo.com Subject: [RFC] hostap: Allow linking with libnl-3. Date: Tue, 15 Nov 2011 16:30:04 -0800 Message-Id: <1321403404-32364-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 Cc: Ben Greear X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From: Ben Greear I needed this patch to compile against the latest libnl code. I added this to my config file: CONFIG_LIBNL32=y Signed-hostap: Ben Greear --- :100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak :100644 100644 30b332f... edf0aef... M src/drivers/drivers.mk src/drivers/drivers.mak | 21 ++++++++++++++------- src/drivers/drivers.mk | 22 +++++++++++++++------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak index 5caeec5..0cc81f9 100644 --- a/src/drivers/drivers.mak +++ b/src/drivers/drivers.mak @@ -26,15 +26,22 @@ NEED_AP_MLME=y NEED_NETLINK=y NEED_LINUX_IOCTL=y NEED_RFKILL=y -ifdef CONFIG_LIBNL_TINY -DRV_LIBS += -lnl-tiny -else -DRV_LIBS += -lnl -endif -ifdef CONFIG_LIBNL20 -DRV_LIBS += -lnl-genl -DRV_CFLAGS += -DCONFIG_LIBNL20 +ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 + DRV_CFLAGS += -DCONFIG_LIBNL20 +else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny + else + DRV_LIBS += -lnl + endif + + ifdef CONFIG_LIBNL20 + DRV_LIBS += -lnl-genl + DRV_CFLAGS += -DCONFIG_LIBNL20 + endif endif endif diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk index 30b332f..edf0aef 100644 --- a/src/drivers/drivers.mk +++ b/src/drivers/drivers.mk @@ -26,16 +26,24 @@ NEED_AP_MLME=y NEED_NETLINK=y NEED_LINUX_IOCTL=y NEED_RFKILL=y -ifdef CONFIG_LIBNL_TINY -DRV_LIBS += -lnl-tiny + +ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 + DRV_CFLAGS += -DCONFIG_LIBNL20 else -DRV_LIBS += -lnl -endif + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny + else + DRV_LIBS += -lnl + endif -ifdef CONFIG_LIBNL20 -DRV_LIBS += -lnl-genl -DRV_CFLAGS += -DCONFIG_LIBNL20 + ifdef CONFIG_LIBNL20 + DRV_LIBS += -lnl-genl + DRV_CFLAGS += -DCONFIG_LIBNL20 + endif endif + endif ifdef CONFIG_DRIVER_BSD