Merge remote-tracking branch 'upstream_linaro/linaro-libnl2_0'

* upstream_linaro/linaro-libnl2_0: (159 commits)
  Updating group definition to follow 3.13 kernel
  Adding version.h
  Adding support for netlink API and quota in nfaccounting
  Compile 2.0 with Kitkat
  Don't include pktloc_syntax.h in BUILT_SOURCES
  route_obj: don't add empty destination to nlmsg
  automake: add ${top_builddir}/include to AM_CFLAGS
  Use CPPFLAGS
  Put preprocessor definitions in AM_CPPFLAGS
  add user data to change_func_t for caches
  Trivial fix for TBF memleak
  libnl: optionally disable cli tools.
  Ignore vim swap files
  Let git ignore generated pktloc source files
  Fix compile warning in utils.c
  Fix compile warning in nl.c
  Packet Location Interface
  src/nf-queue.c: cleanup and improve performance of test program for NF_QUEUE
  Don't install private header files.
  object: fix attribute comparison
  ...

Conflicts:
	Android.mk
	include/linux/netfilter/nfnetlink.h

Change-Id: I383749ca16113b2ae8cfc7729aee8bbc8a36dc9e

1 files changed, 20 insertions, 12 deletions

diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h
index 2cdf345..1cfe220 100644
--- a/include/netlink/netlink.h
+++ b/include/netlink/netlink.h
@@ -20,11 +20,14 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <netdb.h>
 #include <netlink/netlink-compat.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/genetlink.h>
 #include <linux/netfilter/nfnetlink.h>
+#include <netlink/version.h>
+#include <netlink/errno.h>
 #include <netlink/types.h>
 #include <netlink/handlers.h>
 #include <netlink/socket.h>
@@ -33,34 +36,39 @@
 extern "C" {
 #endif
 
+struct ucred;
+
 extern int nl_debug;
 extern struct nl_dump_params nl_debug_dp;
 
 /* Connection Management */
-extern int			nl_connect(struct nl_handle *, int);
-extern void			nl_close(struct nl_handle *);
+extern int			nl_connect(struct nl_sock *, int);
+extern void			nl_close(struct nl_sock *);
 
 /* Send */
-extern int			nl_sendto(struct nl_handle *, void *, size_t);
-extern int			nl_sendmsg(struct nl_handle *, struct nl_msg *,
+extern int			nl_sendto(struct nl_sock *, void *, size_t);
+extern int			nl_sendmsg(struct nl_sock *, struct nl_msg *,
 					   struct msghdr *);
-extern int			nl_send(struct nl_handle *, struct nl_msg *);
-extern int			nl_send_auto_complete(struct nl_handle *,
+extern int			nl_send(struct nl_sock *, struct nl_msg *);
+extern int			nl_send_iovec(struct nl_sock *, struct nl_msg *,
+					      struct iovec *, unsigned);
+extern void			nl_auto_complete(struct nl_sock *,
+						      struct nl_msg *);
+extern int			nl_send_auto_complete(struct nl_sock *,
 						      struct nl_msg *);
-extern int			nl_send_simple(struct nl_handle *, int, int,
+extern int			nl_send_simple(struct nl_sock *, int, int,
 					       void *, size_t);
 
 /* Receive */
-extern int			nl_recv(struct nl_handle *,
+extern int			nl_recv(struct nl_sock *,
 					struct sockaddr_nl *, unsigned char **,
 					struct ucred **);
 
-extern int			nl_recvmsgs(struct nl_handle *, struct nl_cb *);
+extern int			nl_recvmsgs(struct nl_sock *, struct nl_cb *);
 
-#define nl_recvmsgs_def(handle) nl_recvmsgs_default(handle)
-extern int			nl_recvmsgs_default(struct nl_handle *);
+extern int			nl_recvmsgs_default(struct nl_sock *);
 
-extern int			nl_wait_for_ack(struct nl_handle *);
+extern int			nl_wait_for_ack(struct nl_sock *);
 
 /* Netlink Family Translations */
 extern char *			nl_nlfamily2str(int, char *, size_t);