Message ID | 20171028201743.GA32474@embeddedor.com |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
Series | netfilter: ipset: ip_set_bitmap_ipmac: use swap macro in bitmap_ipmac_create | expand |
Hi, On Sat, 28 Oct 2017, Gustavo A. R. Silva wrote: > Make use of the swap macro and remove unnecessary variable tmp. > This makes the code easier to read and maintain. > > This code was detected with the help of Coccinelle. > > Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> Please resubmit the tree patches as a single one, they do the same thing. Thanks! Best regards, Jozsef - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary
Hi Jozsef, Quoting Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>: > Hi, > > On Sat, 28 Oct 2017, Gustavo A. R. Silva wrote: > >> Make use of the swap macro and remove unnecessary variable tmp. >> This makes the code easier to read and maintain. >> >> This code was detected with the help of Coccinelle. >> >> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> > > Please resubmit the tree patches as a single one, they do the same thing. > Thanks! > OK. I'll do that. Thanks -- Gustavo A. R. Silva
diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index 4c279fb..c00b6a2 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -337,12 +337,8 @@ bitmap_ipmac_create(struct net *net, struct ip_set *set, struct nlattr *tb[], ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP_TO], &last_ip); if (ret) return ret; - if (first_ip > last_ip) { - u32 tmp = first_ip; - - first_ip = last_ip; - last_ip = tmp; - } + if (first_ip > last_ip) + swap(first_ip, last_ip); } else if (tb[IPSET_ATTR_CIDR]) { u8 cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
Make use of the swap macro and remove unnecessary variable tmp. This makes the code easier to read and maintain. This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> --- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)