[NETFILTER]: Remove ARRAY_SIZE duplicate

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Kaiser 2005-11-20 21:11:31 -08:00 committed by David S. Miller
parent 2b8f2ff6f4
commit bd4cfb594b

View file

@ -7,8 +7,6 @@
#define IPT_SCTP_VALID_FLAGS 0x07 #define IPT_SCTP_VALID_FLAGS 0x07
#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
struct ipt_sctp_flag_info { struct ipt_sctp_flag_info {
u_int8_t chunktype; u_int8_t chunktype;
@ -59,21 +57,21 @@ struct ipt_sctp_info {
#define SCTP_CHUNKMAP_RESET(chunkmap) \ #define SCTP_CHUNKMAP_RESET(chunkmap) \
do { \ do { \
int i; \ int i; \
for (i = 0; i < ELEMCOUNT(chunkmap); i++) \ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
chunkmap[i] = 0; \ chunkmap[i] = 0; \
} while (0) } while (0)
#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \ #define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
do { \ do { \
int i; \ int i; \
for (i = 0; i < ELEMCOUNT(chunkmap); i++) \ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
chunkmap[i] = ~0; \ chunkmap[i] = ~0; \
} while (0) } while (0)
#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \ #define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
do { \ do { \
int i; \ int i; \
for (i = 0; i < ELEMCOUNT(chunkmap); i++) \ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
destmap[i] = srcmap[i]; \ destmap[i] = srcmap[i]; \
} while (0) } while (0)
@ -81,7 +79,7 @@ struct ipt_sctp_info {
({ \ ({ \
int i; \ int i; \
int flag = 1; \ int flag = 1; \
for (i = 0; i < ELEMCOUNT(chunkmap); i++) { \ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
if (chunkmap[i]) { \ if (chunkmap[i]) { \
flag = 0; \ flag = 0; \
break; \ break; \
@ -94,7 +92,7 @@ struct ipt_sctp_info {
({ \ ({ \
int i; \ int i; \
int flag = 1; \ int flag = 1; \
for (i = 0; i < ELEMCOUNT(chunkmap); i++) { \ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
if (chunkmap[i] != ~0) { \ if (chunkmap[i] != ~0) { \
flag = 0; \ flag = 0; \
break; \ break; \