diff options
| author | Arik Nemtsov <arik@wizery.com> | 2010-11-11 18:10:26 +0200 |
|---|---|---|
| committer | Arik Nemtsov <arik@wizery.com> | 2011-02-09 13:30:43 +0200 |
| commit | bbcb553f0f4636dd40e84d320a576b3de7b95357 (patch) | |
| tree | 710e35ea1a01a071d68c3bc39e26147a5e61545e | |
| parent | 2e6ded94f453ed725381b1fae5dcaa6c7fcfb9b8 (diff) | |
| download | libnl-bbcb553f0f4636dd40e84d320a576b3de7b95357.tar.gz | |
compiles for froyo with Android.mklibnl_android
renamed include/linux/if.h header to not interfere with definitions.
added missing definitions for use by hostapd.
| -rw-r--r-- | Android.mk | 36 | ||||
| -rw-r--r-- | include/linux/genetlink.h | 13 | ||||
| -rw-r--r-- | include/linux/if_bad.h (renamed from include/linux/if.h) | 0 | ||||
| -rw-r--r-- | include/netlink-local.h | 1 |
4 files changed, 49 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 00000000..ca6e5a74 --- /dev/null +++ b/Android.mk @@ -0,0 +1,36 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := lib/cache.c \ + lib/data.c \ + lib/nl.c \ + lib/doc.c \ + lib/cache_mngr.c \ + lib/addr.c \ + lib/socket.c \ + lib/fib_lookup/lookup.c \ + lib/fib_lookup/request.c \ + lib/msg.c \ + lib/object.c \ + lib/attr.c \ + lib/utils.c \ + lib/cache_mngt.c \ + lib/handlers.c \ + lib/genl/ctrl.c \ + lib/genl/mngt.c \ + lib/genl/family.c \ + lib/genl/genl.c \ + lib/route/rtnl.c \ + lib/route/route_utils.c + +#LOCAL_CFLAGS := +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include + #kernel/android-2.6.32/include + +LOCAL_MODULE_TAGS := eng +LOCAL_MODULE := libnl + +include $(BUILD_SHARED_LIBRARY) +#include $(BUILD_STATIC_LIBRARY) + diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index f7a93770..7da02c93 100644 --- a/include/linux/genetlink.h +++ b/include/linux/genetlink.h @@ -39,6 +39,9 @@ enum { CTRL_CMD_NEWOPS, CTRL_CMD_DELOPS, CTRL_CMD_GETOPS, + CTRL_CMD_NEWMCAST_GRP, + CTRL_CMD_DELMCAST_GRP, + CTRL_CMD_GETMCAST_GRP, /* unused */ __CTRL_CMD_MAX, }; @@ -52,6 +55,7 @@ enum { CTRL_ATTR_HDRSIZE, CTRL_ATTR_MAXATTR, CTRL_ATTR_OPS, + CTRL_ATTR_MCAST_GROUPS, __CTRL_ATTR_MAX, }; @@ -66,4 +70,13 @@ enum { #define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1) +enum { + CTRL_ATTR_MCAST_GRP_UNSPEC, + CTRL_ATTR_MCAST_GRP_NAME, + CTRL_ATTR_MCAST_GRP_ID, + __CTRL_ATTR_MCAST_GRP_MAX, +}; + +#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1) + #endif /* __LINUX_GENERIC_NETLINK_H */ diff --git a/include/linux/if.h b/include/linux/if_bad.h index 4c1bcfec..4c1bcfec 100644 --- a/include/linux/if.h +++ b/include/linux/if_bad.h diff --git a/include/netlink-local.h b/include/netlink-local.h index 3c50ea0e..05b4093e 100644 --- a/include/netlink-local.h +++ b/include/netlink-local.h @@ -337,7 +337,6 @@ static inline int nl_cb_call(struct nl_cb *cb, int type, struct nl_msg *msg) } #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0])) -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define __init __attribute__ ((constructor)) #define __exit __attribute__ ((destructor)) |