Commit 10111a6e authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Include supported revisions in module description 



Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent bd9087e0

include/linux/netfilter/ipset/ip_set.h

+6 −0
Original line number Diff line number Diff line
@@ -206,9 +206,15 @@ enum ip_set_kopt { 
#include <linux/netlink.h>

#include <linux/netfilter.h>

#include <linux/netfilter/x_tables.h>

#include <linux/stringify.h>

#include <linux/vmalloc.h>

#include <net/netlink.h>



#define _IP_SET_MODULE_DESC(a, b, c)		\

	MODULE_DESCRIPTION(a " type of IP sets, revisions " b "-" c)

#define IP_SET_MODULE_DESC(a, b, c)		\

	_IP_SET_MODULE_DESC(a, __stringify(b), __stringify(c))



/* Set features */

enum ip_set_feature {

	IPSET_TYPE_IP_FLAG = 0,

net/netfilter/ipset/ip_set_bitmap_ip.c

+6 −3
Original line number Diff line number Diff line
@@ -27,9 +27,12 @@ 
#define IP_SET_BITMAP_TIMEOUT

#include <linux/netfilter/ipset/ip_set_timeout.h>



#define REVISION_MIN	0

#define REVISION_MAX	0



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

MODULE_DESCRIPTION("bitmap:ip type of IP sets");

IP_SET_MODULE_DESC("bitmap:ip", REVISION_MIN, REVISION_MAX);

MODULE_ALIAS("ip_set_bitmap:ip");



/* Type structure */
@@ -556,8 +559,8 @@ static struct ip_set_type bitmap_ip_type __read_mostly = { 
	.features	= IPSET_TYPE_IP,

	.dimension	= IPSET_DIM_ONE,

	.family		= NFPROTO_IPV4,

	.revision_min	= 0,

	.revision_max	= 0,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.create		= bitmap_ip_create,

	.create_policy	= {

		[IPSET_ATTR_IP]		= { .type = NLA_NESTED },

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+6 −3
Original line number Diff line number Diff line
@@ -26,9 +26,12 @@ 
#include <linux/netfilter/ipset/ip_set_timeout.h>

#include <linux/netfilter/ipset/ip_set_bitmap.h>



#define REVISION_MIN	0

#define REVISION_MAX	0



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

MODULE_DESCRIPTION("bitmap:ip,mac type of IP sets");

IP_SET_MODULE_DESC("bitmap:ip,mac", REVISION_MIN, REVISION_MAX);

MODULE_ALIAS("ip_set_bitmap:ip,mac");



enum {
@@ -630,8 +633,8 @@ static struct ip_set_type bitmap_ipmac_type = { 
	.features	= IPSET_TYPE_IP | IPSET_TYPE_MAC,

	.dimension	= IPSET_DIM_TWO,

	.family		= NFPROTO_IPV4,

	.revision_min	= 0,

	.revision_max	= 0,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.create		= bitmap_ipmac_create,

	.create_policy	= {

		[IPSET_ATTR_IP]		= { .type = NLA_NESTED },

net/netfilter/ipset/ip_set_bitmap_port.c

+6 −3
Original line number Diff line number Diff line
@@ -22,9 +22,12 @@ 
#define IP_SET_BITMAP_TIMEOUT

#include <linux/netfilter/ipset/ip_set_timeout.h>



#define REVISION_MIN	0

#define REVISION_MAX	0



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

MODULE_DESCRIPTION("bitmap:port type of IP sets");

IP_SET_MODULE_DESC("bitmap:port", REVISION_MIN, REVISION_MAX);

MODULE_ALIAS("ip_set_bitmap:port");



/* Type structure */
@@ -487,8 +490,8 @@ static struct ip_set_type bitmap_port_type = { 
	.features	= IPSET_TYPE_PORT,

	.dimension	= IPSET_DIM_ONE,

	.family		= NFPROTO_UNSPEC,

	.revision_min	= 0,

	.revision_max	= 0,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.create		= bitmap_port_create,

	.create_policy	= {

		[IPSET_ATTR_PORT]	= { .type = NLA_U16 },

net/netfilter/ipset/ip_set_hash_ip.c

+6 −3
Original line number Diff line number Diff line
@@ -24,9 +24,12 @@ 
#include <linux/netfilter/ipset/ip_set_timeout.h>

#include <linux/netfilter/ipset/ip_set_hash.h>



#define REVISION_MIN	0

#define REVISION_MAX	0



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

MODULE_DESCRIPTION("hash:ip type of IP sets");

IP_SET_MODULE_DESC("hash:ip", REVISION_MIN, REVISION_MAX);

MODULE_ALIAS("ip_set_hash:ip");



/* Type specific function prefix */
@@ -452,8 +455,8 @@ static struct ip_set_type hash_ip_type __read_mostly = { 
	.features	= IPSET_TYPE_IP,

	.dimension	= IPSET_DIM_ONE,

	.family		= NFPROTO_UNSPEC,

	.revision_min	= 0,

	.revision_max	= 0,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.create		= hash_ip_create,

	.create_policy	= {

		[IPSET_ATTR_HASHSIZE]	= { .type = NLA_U32 },