modules: strip unneeded XT_ALIGN from matchsize/targetsize

The x_tables kernel part already does calculate it.

diff --git a/extensions/xt_DHCPMAC.c b/extensions/xt_DHCPMAC.c
index c53dbcbc514439c30710ad4d13260b8adac314d9..33ba1fed731eb144a643b571c50387a46b631799 100644 (file)
--- 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 07f6ecdcef37b6c362d27cb44b4fd3c0abcad081..a5f93772b17ac312c46f15fa77c3faaa6f1e1a4c 100644 (file)
--- 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 d6a0c79369c459b4ee3853ed22ddc015510665c6..3aed62c4ec2d1f858c85407303d35e7222fd4aad 100644 (file)
--- 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 065a30596b188419c1c4bac0c566b18c353627eb..0775cf219cf464a5c6696e97a36315f0ab948e56 100644 (file)
--- 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 aac85ef78316f96f8318f81521cff5691e181c74..5847e6b01cc45d54359b4db74dae0448f950816a 100644 (file)
--- 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 f12fa3fa2863b6f79821b9af4d82e148d2ea9ba2..b136003e62bc2d06831a9e36a0550db175a28e15 100644 (file)
--- 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,
 };