From 1a17ed6a45e0b89473aa861f577a5491952f9eb0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Mar 2010 23:34:25 +0100 Subject: [PATCH] modules: strip unneeded XT_ALIGN from matchsize/targetsize The x_tables kernel part already does calculate it. --- extensions/xt_DHCPMAC.c | 2 +- extensions/xt_IPMARK.c | 4 ++-- extensions/xt_condition.c | 4 ++-- extensions/xt_fuzzy.c | 4 ++-- extensions/xt_iface.c | 4 ++-- extensions/xt_ipv4options.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/xt_DHCPMAC.c b/extensions/xt_DHCPMAC.c index c53dbcb..33ba1fe 100644 --- a/extensions/xt_DHCPMAC.c +++ b/extensions/xt_DHCPMAC.c @@ -139,7 +139,7 @@ static struct xt_match dhcpmac_mt_reg __read_mostly = { .family = NFPROTO_IPV4, .proto = IPPROTO_UDP, .match = dhcpmac_mt, - .matchsize = XT_ALIGN(sizeof(struct dhcpmac_info)), + .matchsize = sizeof(struct dhcpmac_info), .me = THIS_MODULE, }; diff --git a/extensions/xt_IPMARK.c b/extensions/xt_IPMARK.c index 07f6ecd..a5f9377 100644 --- a/extensions/xt_IPMARK.c +++ b/extensions/xt_IPMARK.c @@ -86,7 +86,7 @@ static struct xt_target ipmark_tg_reg[] __read_mostly = { .family = NFPROTO_IPV4, .table = "mangle", .target = ipmark_tg4, - .targetsize = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)), + .targetsize = sizeof(struct xt_ipmark_tginfo), .me = THIS_MODULE, }, { @@ -95,7 +95,7 @@ static struct xt_target ipmark_tg_reg[] __read_mostly = { .family = NFPROTO_IPV6, .table = "mangle", .target = ipmark_tg6, - .targetsize = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)), + .targetsize = sizeof(struct xt_ipmark_tginfo), .me = THIS_MODULE, }, }; diff --git a/extensions/xt_condition.c b/extensions/xt_condition.c index d6a0c79..3aed62c 100644 --- a/extensions/xt_condition.c +++ b/extensions/xt_condition.c @@ -200,7 +200,7 @@ static struct xt_match condition_mt_reg[] __read_mostly = { .name = "condition", .revision = 1, .family = NFPROTO_IPV4, - .matchsize = XT_ALIGN(sizeof(struct xt_condition_mtinfo)), + .matchsize = sizeof(struct xt_condition_mtinfo), .match = condition_mt, .checkentry = condition_mt_check, .destroy = condition_mt_destroy, @@ -210,7 +210,7 @@ static struct xt_match condition_mt_reg[] __read_mostly = { .name = "condition", .revision = 1, .family = NFPROTO_IPV6, - .matchsize = XT_ALIGN(sizeof(struct xt_condition_mtinfo)), + .matchsize = sizeof(struct xt_condition_mtinfo), .match = condition_mt, .checkentry = condition_mt_check, .destroy = condition_mt_destroy, diff --git a/extensions/xt_fuzzy.c b/extensions/xt_fuzzy.c index 065a305..0775cf2 100644 --- a/extensions/xt_fuzzy.c +++ b/extensions/xt_fuzzy.c @@ -146,7 +146,7 @@ static struct xt_match fuzzy_mt_reg[] __read_mostly = { .family = NFPROTO_IPV4, .match = fuzzy_mt, .checkentry = fuzzy_mt_check, - .matchsize = XT_ALIGN(sizeof(struct xt_fuzzy_mtinfo)), + .matchsize = sizeof(struct xt_fuzzy_mtinfo), .me = THIS_MODULE, }, { @@ -155,7 +155,7 @@ static struct xt_match fuzzy_mt_reg[] __read_mostly = { .family = NFPROTO_IPV6, .match = fuzzy_mt, .checkentry = fuzzy_mt_check, - .matchsize = XT_ALIGN(sizeof(struct xt_fuzzy_mtinfo)), + .matchsize = sizeof(struct xt_fuzzy_mtinfo), .me = THIS_MODULE, }, }; diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c index aac85ef..5847e6b 100644 --- a/extensions/xt_iface.c +++ b/extensions/xt_iface.c @@ -71,7 +71,7 @@ static struct xt_match xt_iface_mt_reg[] __read_mostly = { .name = "iface", .revision = 0, .family = NFPROTO_IPV4, - .matchsize = XT_ALIGN(sizeof(struct xt_iface_mtinfo)), + .matchsize = sizeof(struct xt_iface_mtinfo), .match = xt_iface_mt, .me = THIS_MODULE, }, @@ -79,7 +79,7 @@ static struct xt_match xt_iface_mt_reg[] __read_mostly = { .name = "iface", .revision = 0, .family = NFPROTO_IPV6, - .matchsize = XT_ALIGN(sizeof(struct xt_iface_mtinfo)), + .matchsize = sizeof(struct xt_iface_mtinfo), .match = xt_iface_mt, .me = THIS_MODULE, }, diff --git a/extensions/xt_ipv4options.c b/extensions/xt_ipv4options.c index f12fa3f..b136003 100644 --- a/extensions/xt_ipv4options.c +++ b/extensions/xt_ipv4options.c @@ -50,7 +50,7 @@ static struct xt_match ipv4options_mt_reg __read_mostly = { .revision = 1, .family = NFPROTO_IPV4, .match = ipv4options_mt, - .matchsize = XT_ALIGN(sizeof(struct xt_ipv4options_mtinfo1)), + .matchsize = sizeof(struct xt_ipv4options_mtinfo1), .me = THIS_MODULE, };