diff options
| author | JP Abgrall <jpa@google.com> | 2014-02-14 13:27:00 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-02-14 13:27:00 -0800 |
| commit | 823435f737de20d5ca9f4aa2ba0ae2950dbb5d4f (patch) | |
| tree | e146cd87948eb11eb195d463b49dc8b1bdeb0db0 /include/netlink/route/classifier-modules.h | |
| parent | 0021213ea39d6a889b6ed6e24dc1c2142ae175bf (diff) | |
| parent | 515d3af751f58f1645d09f0a750b759cdc7820c3 (diff) | |
| download | android_external_libnl-823435f737de20d5ca9f4aa2ba0ae2950dbb5d4f.tar.gz android_external_libnl-823435f737de20d5ca9f4aa2ba0ae2950dbb5d4f.tar.bz2 android_external_libnl-823435f737de20d5ca9f4aa2ba0ae2950dbb5d4f.zip | |
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
Diffstat (limited to 'include/netlink/route/classifier-modules.h')
| -rw-r--r-- | include/netlink/route/classifier-modules.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/netlink/route/classifier-modules.h b/include/netlink/route/classifier-modules.h index 8c31e67..35cb06e 100644 --- a/include/netlink/route/classifier-modules.h +++ b/include/netlink/route/classifier-modules.h @@ -6,7 +6,7 @@ * License as published by the Free Software Foundation version 2.1 * of the License. * - * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch> + * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch> */ #ifndef NETLINK_CLASS_MODULES_H_ @@ -25,19 +25,25 @@ extern "C" { struct rtnl_cls_ops { /** - * Kind/Name of classifier + * Name of classifier module */ char co_kind[32]; + + /** + * Size of private classifier data + */ + size_t co_size; + /** * Dump callbacks */ - int (*co_dump[NL_DUMP_MAX+1])(struct rtnl_cls *, - struct nl_dump_params *, int); + void (*co_dump[NL_DUMP_MAX+1])(struct rtnl_cls *, + struct nl_dump_params *); /** * Must return the contents supposed to be in TCA_OPTIONS */ - struct nl_msg *(*co_get_opts)(struct rtnl_cls *); + int (*co_get_opts)(struct rtnl_cls *, struct nl_msg *); /** * TCA_OPTIONS message parser |