1 files changed, 2 insertions, 4 deletions

diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c
index 49323110560..c46e3440159 100644
--- a/net/netfilter/ipset/ip_set_bitmap_ip.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ip.c
@@ -283,8 +283,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[],
 
                 if (cidr > 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                ip &= ip_set_hostmask(cidr);
-                ip_to = ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(ip, ip_to, cidr);
         } else
                 ip_to = ip;
 
@@ -478,8 +477,7 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
 
                 if (cidr >= 32)
                         return -IPSET_ERR_INVALID_CIDR;
-                first_ip &= ip_set_hostmask(cidr);
-                last_ip = first_ip | ~ip_set_hostmask(cidr);
+                ip_set_mask_from_to(first_ip, last_ip, cidr);
         } else
                 return -IPSET_ERR_PROTOCOL;