aboutsummaryrefslogtreecommitdiffstats
path: root/package/swconfig/src/swlib.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-30 13:57:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-30 13:57:38 +0000
commitad9d1857a5d06f1ba55ed03a005aa4b0d7659a0a (patch)
tree505abfab6799f137b1427086f0b70bb7f2d50586 /package/swconfig/src/swlib.c
parent938553bd69d1484b9d25495da4e7c2f09927638c (diff)
downloadupstream-ad9d1857a5d06f1ba55ed03a005aa4b0d7659a0a.tar.gz
upstream-ad9d1857a5d06f1ba55ed03a005aa4b0d7659a0a.tar.bz2
upstream-ad9d1857a5d06f1ba55ed03a005aa4b0d7659a0a.zip
swconfig: use libnl-tiny instead of libnl
SVN-Revision: 15508
Diffstat (limited to 'package/swconfig/src/swlib.c')
-rw-r--r--package/swconfig/src/swlib.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/package/swconfig/src/swlib.c b/package/swconfig/src/swlib.c
index fbc036555d..04b3bef49d 100644
--- a/package/swconfig/src/swlib.c
+++ b/package/swconfig/src/swlib.c
@@ -24,6 +24,9 @@
#include <sys/socket.h>
#include <linux/switch.h>
#include "swlib.h"
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
//#define DEBUG 1
#ifdef DEBUG
@@ -32,7 +35,7 @@
#define DPRINTF(fmt, ...) do {} while (0)
#endif
-static struct nl_handle *handle;
+static struct nl_sock *handle;
static struct nl_cache *cache;
static struct genl_family *family;
static struct nlattr *tb[SWITCH_ATTR_MAX];
@@ -507,7 +510,7 @@ swlib_priv_free(void)
if (cache)
nl_cache_free(cache);
if (handle)
- nl_handle_destroy(handle);
+ nl_socket_free(handle);
handle = NULL;
cache = NULL;
}
@@ -515,7 +518,9 @@ swlib_priv_free(void)
static int
swlib_priv_init(void)
{
- handle = nl_handle_alloc();
+ int ret;
+
+ handle = nl_socket_alloc();
if (!handle) {
DPRINTF("Failed to create handle\n");
goto err;
@@ -526,8 +531,8 @@ swlib_priv_init(void)
goto err;
}
- cache = genl_ctrl_alloc_cache(handle);
- if (!cache) {
+ ret = genl_ctrl_alloc_cache(handle, &cache);
+ if (ret < 0) {
DPRINTF("Failed to allocate netlink cache\n");
goto err;
}