diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-02-24 22:07:40 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-02-24 22:07:40 +0100 |
| commit | 7de1b275f16528509ec93bcc1f3ffa81f2d9faa8 (patch) | |
| tree | 566e65032a600672a006848ed70d6363c7803e62 | |
| parent | 76d76012f0653588fc02974aed4299552f719f01 (diff) | |
Add compatibility to support EXPORT_SYMBOL_GPL in module.h
Fixes netfilter bugzilla id #1008
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 43d3923..390673c 100644 --- a/configure.ac +++ b/configure.ac @@ -437,6 +437,16 @@ else AC_SUBST(HAVE_NET_IN_NFNL_CALLBACK_FN, undef) fi +AC_MSG_CHECKING([kernel source for EXPORT_SYMBOL_GPL in module.h]) +if test -f $ksourcedir/include/linux/module.h && \ + $GREP -q 'EXPORT_SYMBOL_GPL' $ksourcedir/include/linux/module.h; then + AC_MSG_RESULT(yes) + AC_SUBST(HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H, define) +else + AC_MSG_RESULT(no) + AC_SUBST(HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H, undef) +fi + AC_MSG_CHECKING([kernel source for struct net_generic]) if test -f $ksourcedir/include/net/netns/generic.h && \ $GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index f08f538..9c405df 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -31,6 +31,11 @@ #@HAVE_NF_BRIDGE_GET_PHYSDEV@ HAVE_NF_BRIDGE_GET_PHYSDEV #@HAVE_NLA_PUT_IN_ADDR@ HAVE_NLA_PUT_IN_ADDR #@HAVE_NET_IN_NFNL_CALLBACK_FN@ HAVE_NET_IN_NFNL_CALLBACK_FN +#@HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H@ HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H + +#ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H +#include <linux/module.h> +#endif #ifdef HAVE_EXPORT_H #include <linux/export.h> |