On Wednesday 18 September 2013 19:23:00 Jozsef Kadlecsik wrote: > Hi Oliver, > > Please check your patches with checkpatch.pl and fix all errors, warnings. > Of course, sorry about that. > On Tue, 17 Sep 2013, Oliver wrote: <snip> > > @@ -461,6 +462,9 @@ mtype_expire(struct ip_set *set, struct htype *h, u8 > > nets_length, size_t dsize)> > > struct mtype_elem *data; > > u32 i; > > int j; > > > > +#if IPSET_NET_COUNT > 1 > > + u8 k; > > +#endif > > Please get rid of all these #if .. [#else ...] #endif constructions, > except in mtype_test_cidrs. The compiler optimizes away the for loop when > IPSET_NET_COUNT == 1. Yep, there's a couple of other places where I don't currently see a way around it, but anywhere that it doesn't pose a logical problem to existing types, I've removed it. > > + if (unlikely(!tb[IPSET_ATTR_IP] || !tb[IPSET_ATTR_IP2] || > > + !ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) || > > + !ip_set_optattr_netorder(tb, IPSET_ATTR_CADT_FLAGS) || > > + !ip_set_optattr_netorder(tb, IPSET_ATTR_PACKETS) || > > + !ip_set_optattr_netorder(tb, IPSET_ATTR_BYTES))) > > + return -IPSET_ERR_PROTOCOL; > > + if (unlikely(tb[IPSET_ATTR_IP_TO])) > > + return -IPSET_ERR_HASH_RANGE_UNSUPPORTED; > > Check tb[IPSET_ATTR_IP2_TO] in the condition above too. This is IPv6, I thought ranges weren't even legitimate here, also, if this is wrong, hash:net must be too... Or does IP2_TO not mean what I think it means? Kind Regards, Oliver -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
