From: Tim Gardner <tim.gardner@canonical.com>
To: mcgrof@gmail.com
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH] crda - Add nested support for libnl-1, libnl-2.0, and libnl-3.0
Date: Mon, 08 Aug 2011 11:31:14 -0600 [thread overview]
Message-ID: <4E401D62.80800@canonical.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 92 bytes --]
libnl-3.0 is the version used for Ubuntu Oneiric.
--
Tim Gardner tim.gardner@canonical.com
[-- Attachment #2: 0001-Add-nested-support-for-libnl-1-libnl-2.0-and-libnl-3.patch --]
[-- Type: text/x-patch, Size: 1827 bytes --]
>From 339e3811bbb140253fc7c8225322a51420046df6 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Mon, 8 Aug 2011 10:49:49 -0600
Subject: [PATCH] Add nested support for libnl-1, libnl-2.0, and libnl-3.0
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
Makefile | 21 ++++++++++++++-------
crda.c | 4 ++--
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index b8bc7d3..084d8e5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,15 +47,22 @@ INSTALL ?= install
NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)
NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y)
+NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0 && echo Y)
-ifeq ($(NL1FOUND),Y)
-NLLIBNAME = libnl-1
-endif
-
-ifeq ($(NL2FOUND),Y)
-CFLAGS += -DCONFIG_LIBNL20
+ifeq ($(NL3FOUND),Y)
+CFLAGS += -DCONFIG_LIBNL30
NLLIBS += -lnl-genl
-NLLIBNAME = libnl-2.0
+NLLIBNAME = libnl-3.0
+else
+ ifeq ($(NL2FOUND),Y)
+ CFLAGS += -DCONFIG_LIBNL20
+ NLLIBS += -lnl-genl
+ NLLIBNAME = libnl-2.0
+ else
+ ifeq ($(NL1FOUND),Y)
+ NLLIBNAME = libnl-1
+ endif
+ endif
endif
ifeq ($(NLLIBNAME),)
diff --git a/crda.c b/crda.c
index d2ba29a..6857e3f 100644
--- a/crda.c
+++ b/crda.c
@@ -21,7 +21,7 @@
#include "regdb.h"
#include "reglib.h"
-#ifndef CONFIG_LIBNL20
+#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
/* libnl 2.0 compatibility code */
static inline struct nl_handle *nl_socket_alloc(void)
{
@@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache *
#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
#define nl_sock nl_handle
-#endif /* CONFIG_LIBNL20 */
+#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */
struct nl80211_state {
struct nl_sock *nl_sock;
--
1.7.0.4
next reply other threads:[~2011-08-08 17:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-08 17:31 Tim Gardner [this message]
2011-08-09 23:55 ` [PATCH] crda - Add nested support for libnl-1, libnl-2.0, and libnl-3.0 Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E401D62.80800@canonical.com \
--to=tim.gardner@canonical.com \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.