From 5b20d409ef3062b24bbe7667f0daec34523446a6 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 22 Apr 2010 17:00:42 +0200 Subject: Fifth stage to ipset-5 Rename files in kernel/ and get rid of old ones (2.4.x kernel tree support). --- kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h (limited to 'kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h') diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h b/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h deleted file mode 100644 index d16c0ae..0000000 --- a/kernel/include/linux/netfilter_ipv4/ip_set_ipmap.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef __IP_SET_IPMAP_H -#define __IP_SET_IPMAP_H - -#include -#include - -#define SETTYPE_NAME "ipmap" - -struct ip_set_ipmap { - void *members; /* the ipmap proper */ - ip_set_ip_t first_ip; /* host byte order, included in range */ - ip_set_ip_t last_ip; /* host byte order, included in range */ - ip_set_ip_t netmask; /* subnet netmask */ - ip_set_ip_t sizeid; /* size of set in IPs */ - ip_set_ip_t hosts; /* number of hosts in a subnet */ - u_int32_t size; /* size of the ipmap proper */ -}; - -struct ip_set_req_ipmap_create { - ip_set_ip_t from; - ip_set_ip_t to; - ip_set_ip_t netmask; -}; - -struct ip_set_req_ipmap { - ip_set_ip_t ip; -}; - -static inline unsigned int -mask_to_bits(ip_set_ip_t mask) -{ - unsigned int bits = 32; - ip_set_ip_t maskaddr; - - if (mask == 0xFFFFFFFF) - return bits; - - maskaddr = 0xFFFFFFFE; - while (--bits > 0 && maskaddr != mask) - maskaddr <<= 1; - - return bits; -} - -static inline ip_set_ip_t -range_to_mask(ip_set_ip_t from, ip_set_ip_t to, unsigned int *bits) -{ - ip_set_ip_t mask = 0xFFFFFFFE; - - *bits = 32; - while (--(*bits) > 0 && mask && (to & mask) != from) - mask <<= 1; - - return mask; -} - -#endif /* __IP_SET_IPMAP_H */ -- cgit v1.2.3