diff options
| author | Neutron Soutmun <neo.neutron@gmail.com> | 2016-06-23 17:22:11 +0700 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-06-28 10:19:35 +0200 |
| commit | caaa867cc7941814216950406c34ef27f73eca54 (patch) | |
| tree | e280bc8d74b3b56a0a6daf2024c14722952c67ea /configure.ac | |
| parent | b20bcc4dff2156ef7b6878a65c3cc9f9ca7331ab (diff) | |
ipset: Backports for the nla_put_net64() API changes
* Backports the patch "libnl: nla_put_net64():align on a 64-bit area" [1]
by Nicolas Dichtel <nicolas.dichtel@6wind.com>
* Since the nla_put_net64() API has been changed, therefore, the
ip_set_compat.h.in should provides the macro IPSET_NLA_PUT_NET64 that
point to the nla_put_net64() with appropriate number of arguments.
The build script should distinguish the API changes by detect for
the existence of nla_put_64bit() function in include/net/netlink.h.
This function was added in the same patches set and called by
the nla_put_be64() that called by nla_put_net64() respectively.
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=e9bbe898cbe89b17ad3993c136aa13d0431cd537
Signed-off-by: Neutron Soutmun <neo.neutron@gmail.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 7156ab8..b73b3cc 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,16 @@ else AC_SUBST(HAVE_NLA_PUT_BE64, undef) fi +AC_MSG_CHECKING([kernel source for nla_put_64bit]) +if test -f $ksourcedir/include/net/netlink.h && \ + $GREP -q 'nla_put_64bit' $ksourcedir/include/net/netlink.h; then + AC_MSG_RESULT(yes) + AC_SUBST(HAVE_NLA_PUT_64BIT, define) +else + AC_MSG_RESULT(no) + AC_SUBST(HAVE_NLA_PUT_64BIT, undef) +fi + AC_MSG_CHECKING([kernel source for portid in nl_info]) if test -f $ksourcedir/include/linux/netlink.h && \ $AWK '/^struct netlink_skb_parms/ {for(i=1; i<=5; i++) {getline; print}}' $ksourcedir/include/linux/netlink.h | $GREP -q 'portid;'; then |