diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:19:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:19:26 -0500 |
| commit | 18a4144028f056b77d6576d4eb284246e9c7ea97 (patch) | |
| tree | 85277bf6b49982753d762d58a14aa642e79c037e /include/linux | |
| parent | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (diff) | |
| parent | 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 472f04834809..59ff6c430cf6 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
| @@ -19,7 +19,7 @@ struct xt_get_revision | |||
| 19 | /* For standard target */ | 19 | /* For standard target */ |
| 20 | #define XT_RETURN (-NF_REPEAT - 1) | 20 | #define XT_RETURN (-NF_REPEAT - 1) |
| 21 | 21 | ||
| 22 | #define XT_ALIGN(s) (((s) + (__alignof__(void *)-1)) & ~(__alignof__(void *)-1)) | 22 | #define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1)) |
| 23 | 23 | ||
| 24 | /* Standard return verdict, or do jump. */ | 24 | /* Standard return verdict, or do jump. */ |
| 25 | #define XT_STANDARD_TARGET "" | 25 | #define XT_STANDARD_TARGET "" |