git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv4
/
ipt_sctp.h
diff --git
a/include/linux/netfilter_ipv4/ipt_sctp.h
b/include/linux/netfilter_ipv4/ipt_sctp.h
index
e93a9ec
..
80b3dba
100644
(file)
--- a/
include/linux/netfilter_ipv4/ipt_sctp.h
+++ b/
include/linux/netfilter_ipv4/ipt_sctp.h
@@
-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 {
u_int8_t chunktype;
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; \
#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; \
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; \
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)
destmap[i] = srcmap[i]; \
} while (0)
@@
-81,7
+79,7
@@
struct ipt_sctp_info {
({ \
int i; \
int flag = 1; \
({ \
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; \
if (chunkmap[i]) { \
flag = 0; \
break; \
@@
-94,7
+92,7
@@
struct ipt_sctp_info {
({ \
int i; \
int flag = 1; \
({ \
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; \
if (chunkmap[i] != ~0) { \
flag = 0; \
break; \