Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4cfb59 authored by Nicolas Kaiser's avatar Nicolas Kaiser Committed by David S. Miller
Browse files

[NETFILTER]: Remove ARRAY_SIZE duplicate 



Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b8f2ff6

include/linux/netfilter_ipv4/ipt_sctp.h

+5 −7
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#define IPT_SCTP_VALID_FLAGS		0x07



#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))





struct ipt_sctp_flag_info {

	u_int8_t chunktype;
@@ -59,21 +57,21 @@ struct ipt_sctp_info { 
#define SCTP_CHUNKMAP_RESET(chunkmap) 				\

	do {							\

		int i; 						\

		for (i = 0; i < ELEMCOUNT(chunkmap); i++)	\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			chunkmap[i] = 0;			\

	} while (0)



#define SCTP_CHUNKMAP_SET_ALL(chunkmap) 			\

	do {							\

		int i; 						\

		for (i = 0; i < ELEMCOUNT(chunkmap); i++) 	\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			chunkmap[i] = ~0;			\

	} while (0)



#define SCTP_CHUNKMAP_COPY(destmap, srcmap) 			\

	do {							\

		int i; 						\

		for (i = 0; i < ELEMCOUNT(chunkmap); i++) 	\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			destmap[i] = srcmap[i];			\

	} while (0)
@@ -81,7 +79,7 @@ struct ipt_sctp_info { 
({							\

	int i; 						\

	int flag = 1;					\

	for (i = 0; i < ELEMCOUNT(chunkmap); i++) {	\

	for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {	\

		if (chunkmap[i]) {			\

			flag = 0;			\

			break;				\
@@ -94,7 +92,7 @@ struct ipt_sctp_info { 
({							\

	int i; 						\

	int flag = 1;					\

	for (i = 0; i < ELEMCOUNT(chunkmap); i++) {	\

	for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {	\

		if (chunkmap[i] != ~0) {		\

			flag = 0;			\

				break;			\