tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Nicolas Kaiser
and committed by
David S. Miller
bd4cfb59
2b8f2ff6
+5
-7
+5
-7
include/linux/netfilter_ipv4/ipt_sctp.h
+5
-7
include/linux/netfilter_ipv4/ipt_sctp.h
···
7
7
8
8
#define IPT_SCTP_VALID_FLAGS 0x07
9
9
10
-
#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
11
-
12
10
13
11
struct ipt_sctp_flag_info {
14
12
u_int8_t chunktype;
···
57
59
#define SCTP_CHUNKMAP_RESET(chunkmap) \
58
60
do { \
59
61
int i; \
60
-
for (i = 0; i < ELEMCOUNT(chunkmap); i++) \
62
+
for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
61
63
chunkmap[i] = 0; \
62
64
} while (0)
63
65
64
66
#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
65
67
do { \
66
68
int i; \
67
-
for (i = 0; i < ELEMCOUNT(chunkmap); i++) \
69
+
for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
68
70
chunkmap[i] = ~0; \
69
71
} while (0)
70
72
71
73
#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
72
74
do { \
73
75
int i; \
74
-
for (i = 0; i < ELEMCOUNT(chunkmap); i++) \
76
+
for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
75
77
destmap[i] = srcmap[i]; \
76
78
} while (0)
77
79
···
79
81
({ \
80
82
int i; \
81
83
int flag = 1; \
82
-
for (i = 0; i < ELEMCOUNT(chunkmap); i++) { \
84
+
for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
83
85
if (chunkmap[i]) { \
84
86
flag = 0; \
85
87
break; \
···
92
94
({ \
93
95
int i; \
94
96
int flag = 1; \
95
-
for (i = 0; i < ELEMCOUNT(chunkmap); i++) { \
97
+
for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
96
98
if (chunkmap[i] != ~0) { \
97
99
flag = 0; \
98
100
break; \