diff options
| author | Sergey Popovich <popovich_sergei@mail.ua> | 2014-11-15 12:08:44 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-03-19 13:52:17 +0100 |
| commit | e9d2792d31bc13145d94106bc956e00d4af26e7a (patch) | |
| tree | a0c13dc625b886bbf3a4c10e63714f02f5112408 /kernel/net/netfilter/ipset/ip_set_hash_ipport.c | |
| parent | 3f4ad4a50dce22dd3981cb026b046c91a50c3952 (diff) | |
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>
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_hash_ipport.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_ipport.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ipport.c b/kernel/net/netfilter/ipset/ip_set_hash_ipport.c index 0dc521e..3f386ff 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_ipport.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_ipport.c @@ -84,7 +84,6 @@ hash_ipport4_data_next(struct hash_ipport4_elem *next, } #define MTYPE hash_ipport4 -#define PF 4 #define HOST_MASK 32 #define HKEY_DATALEN sizeof(struct hash_ipport4_elem) #include "ip_set_hash_gen.h" @@ -246,12 +245,10 @@ hash_ipport6_data_next(struct hash_ipport4_elem *next, } #undef MTYPE -#undef PF #undef HOST_MASK #undef HKEY_DATALEN #define MTYPE hash_ipport6 -#define PF 6 #define HOST_MASK 128 #define HKEY_DATALEN sizeof(struct hash_ipport6_elem) #define IP_SET_EMIT_CREATE |