diff options
| author | Sergey Popovich | 2015-05-02 19:28:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-05-13 13:25:46 +0200 |
| commit | 43ef29c91a247e9e0cc4d4538c1d1f5b8ca728c1 (patch) | |
| tree | e89744f0dc17b7bc5fa5d4cf593f49d9468d7407 /net/netfilter/ipset/ip_set_hash_netnet.c | |
| parent | netfilter: ipset: No need to make nomatch bitfield (diff) | |
| download | kernel-qcow2-linux-43ef29c91a247e9e0cc4d4538c1d1f5b8ca728c1.tar.gz kernel-qcow2-linux-43ef29c91a247e9e0cc4d4538c1d1f5b8ca728c1.tar.xz kernel-qcow2-linux-43ef29c91a247e9e0cc4d4538c1d1f5b8ca728c1.zip | |
netfilter: ipset: Preprocessor directices cleanup
* Undefine mtype_data_reset_elem before defining.
* Remove duplicated mtype_gc_init undefine, move
mtype_gc_init define closer to mtype_gc define.
* Use htype instead of HTYPE in IPSET_TOKEN(HTYPE, _create)().
* Remove PF definition from sets: no more used.
Signed-off-by: Sergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/ipset/ip_set_hash_netnet.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_hash_netnet.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/ipset/ip_set_hash_netnet.c b/net/netfilter/ipset/ip_set_hash_netnet.c index ea8772afb6e7..9c6da0cf6e2a 100644 --- a/net/netfilter/ipset/ip_set_hash_netnet.c +++ b/net/netfilter/ipset/ip_set_hash_netnet.c @@ -128,7 +128,6 @@ hash_netnet4_data_next(struct hash_netnet4_elem *next, } #define MTYPE hash_netnet4 -#define PF 4 #define HOST_MASK 32 #include "ip_set_hash_gen.h" @@ -354,11 +353,9 @@ hash_netnet6_data_next(struct hash_netnet4_elem *next, } #undef MTYPE -#undef PF #undef HOST_MASK #define MTYPE hash_netnet6 -#define PF 6 #define HOST_MASK 128 #define IP_SET_EMIT_CREATE #include "ip_set_hash_gen.h" |