Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: ipset: move function to ip_set_bitmap_ip.c.

One inline function in ip_set_bitmap.h is only called in
ip_set_bitmap_ip.c: move it and remove inline function specifier.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso
3fbd6c45 85639185

+12 -14
-14
include/linux/netfilter/ipset/ip_set_bitmap.h
··· 12 12 IPSET_ADD_START_STORED_TIMEOUT, 13 13 }; 14 14 15 - /* Common functions */ 16 - 17 - static inline u32 18 - range_to_mask(u32 from, u32 to, u8 *bits) 19 - { 20 - u32 mask = 0xFFFFFFFE; 21 - 22 - *bits = 32; 23 - while (--(*bits) > 0 && mask && (to & mask) != from) 24 - mask <<= 1; 25 - 26 - return mask; 27 - } 28 - 29 15 #endif /* __IP_SET_BITMAP_H */
+12
net/netfilter/ipset/ip_set_bitmap_ip.c
··· 237 237 return true; 238 238 } 239 239 240 + static u32 241 + range_to_mask(u32 from, u32 to, u8 *bits) 242 + { 243 + u32 mask = 0xFFFFFFFE; 244 + 245 + *bits = 32; 246 + while (--(*bits) > 0 && mask && (to & mask) != from) 247 + mask <<= 1; 248 + 249 + return mask; 250 + } 251 + 240 252 static int 241 253 bitmap_ip_create(struct net *net, struct ip_set *set, struct nlattr *tb[], 242 254 u32 flags)