diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2012-11-27 14:58:03 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2012-11-27 14:58:03 +0100 |
| commit | bf199cd765324da8aff2300a3ea1169372ecbe0b (patch) | |
| tree | f6e5eaaf875abcfa6ed2574db799679c9f7fb8f5 | |
| parent | a9ff31b7aa8dbb12c04fdf2b0add6a9966a5cb67 (diff) | |
Add ipset package version to external module description
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f4fd978..9e2d59b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,7 @@ modules_sparse: if WITH_KMOD ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \ V=$V C=2 CF=-D__CHECK_ENDIAN__ \ + KCFLAGS="-DPACKAGE_VERSION=$(PACKAGE_VERSION)" \ IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules else @echo Skipping kernel modules due to --with-kmod=no @@ -29,6 +30,7 @@ endif modules: if WITH_KMOD ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \ + KCFLAGS="-DPACKAGE_VERSION=$(PACKAGE_VERSION)" \ IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules else @echo Skipping kernel modules due to --with-kmod=no diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index b32912f..bd87ef8 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -43,11 +43,16 @@ static ip_set_id_t ip_set_max = CONFIG_IP_SET_MAX; /* max number of sets */ static unsigned int max_sets; +#define _IP_SET_CORE_MODULE_DESC(a) \ + MODULE_DESCRIPTION("core IP set support (v" a ")") +#define IP_SET_CORE_MODULE_DESC(a) \ + _IP_SET_CORE_MODULE_DESC(__stringify(a)) + module_param(max_sets, int, 0600); MODULE_PARM_DESC(max_sets, "maximal number of sets"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>"); -MODULE_DESCRIPTION("core IP set support"); +IP_SET_CORE_MODULE_DESC(PACKAGE_VERSION); MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_IPSET); #ifndef rcu_dereference_protected |