From: Jozsef Kadlecsik Date: Thu, 16 Jun 2011 16:53:51 +0000 (+0200) Subject: netfilter: ipset: adding ranges to hash types with timeout could still fail, fixed X-Git-Tag: MMI-PSA29.97-13-9~18929^2~442 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c64562eaf2ad61d7492788ef95678f52d0d28f2a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git netfilter: ipset: adding ranges to hash types with timeout could still fail, fixed The patch "Fix adding ranges to hash types" had got a mistypeing in the timeout variant of the hash types, which actually made the patch ineffective. Fixed! Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy --- diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h index 905e2ac32daf..a099d40d120a 100644 --- a/include/linux/netfilter/ipset/ip_set_ahash.h +++ b/include/linux/netfilter/ipset/ip_set_ahash.h @@ -835,7 +835,7 @@ type_pf_tadd(struct ip_set *set, void *value, u32 timeout, u32 flags) } ret = type_pf_elem_tadd(n, d, timeout); if (ret != 0) { - if (ret == -EEXIST) + if (ret == -EAGAIN) type_pf_data_next(h, d); goto out; }