extensions: bump revision number to avoid possible POM clash

Users still using a kernel with POM modules may have problems due to
differing binary structures. Bump the revision numbers of the
Xtables-addons modules, to make them distinct from POM.

diff --git a/extensions/libxt_IPMARK.c b/extensions/libxt_IPMARK.c
index c08457282a6084e75ad2846e78c0222cc6a59864..6260f18685ac5f3fdc6f59c47cd513e1df0b7749 100644 (file)
--- a/extensions/libxt_IPMARK.c
+++ b/extensions/libxt_IPMARK.c
@@ -147,7 +147,7 @@ static struct xtables_target ipmark_tg_reg = {
        .version       = XTABLES_VERSION,
        .name          = "IPMARK",
        .family        = PF_UNSPEC,
-       .revision      = 0,
+       .revision      = 1,
        .size          = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)),
        .userspacesize = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)),
        .help          = ipmark_tg_help,

diff --git a/extensions/libxt_SYSRQ.c b/extensions/libxt_SYSRQ.c
index 2ad57874083a52afbda1e1c87c737e8c49c9cbf6..b070fb8d285ec4bf2f198db8b4852aa152653bc9 100644 (file)
--- a/extensions/libxt_SYSRQ.c
+++ b/extensions/libxt_SYSRQ.c
@@ -24,6 +24,7 @@ static void sysrq_tg_check(unsigned int flags)
 static struct xtables_target sysrq_tg_reg = {
        .version       = XTABLES_VERSION,
        .name          = "SYSRQ",
+       .revision      = 1,
        .family        = PF_UNSPEC,
        .size          = XT_ALIGN(0),
        .userspacesize = XT_ALIGN(0),

diff --git a/extensions/libxt_condition.c b/extensions/libxt_condition.c
index 7a13d279db58bdec43f7ae97fa46421ce7d1caa4..eabe72fbe75e44892de3447eb3df0be0d03258fe 100644 (file)
--- a/extensions/libxt_condition.c
+++ b/extensions/libxt_condition.c
@@ -79,7 +79,7 @@ static void condition_save(const void *ip, const struct xt_entry_match *match)
 
 static struct xtables_match condition_mt_reg = {
        .name           = "condition",
-       .revision       = 0,
+       .revision       = 1,
        .family         = PF_UNSPEC,
        .version        = XTABLES_VERSION,
        .size           = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),

diff --git a/extensions/libxt_fuzzy.c b/extensions/libxt_fuzzy.c
index 23531043772b72e5fef5e39b69a1e50da72fcbf8..de8297e152c14bc4697f41a57ff57e6769da174f 100644 (file)
--- a/extensions/libxt_fuzzy.c
+++ b/extensions/libxt_fuzzy.c
@@ -101,6 +101,7 @@ static void fuzzy_mt_save(const void *ip, const struct xt_entry_match *match)
 
 static struct xtables_match fuzzy_mt_reg = { 
        .name          = "fuzzy",
+       .revision      = 1,
        .version       = XTABLES_VERSION,
        .size          = XT_ALIGN(sizeof(struct xt_fuzzy_mtinfo)),
        .userspacesize = offsetof(struct xt_fuzzy_mtinfo, packets_total),

diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c
index 60b409ccb0f8ab5671ae9e4c688671302864e65c..ba57d0723ff3aedc8b920605ba5514a0c0e9677d 100644 (file)
--- a/extensions/libxt_geoip.c
+++ b/extensions/libxt_geoip.c
@@ -261,6 +261,7 @@ geoip_save(const void *ip, const struct xt_entry_match *match)
 static struct xtables_match geoip_match = {
         .family        = AF_INET,
         .name          = "geoip",
+        .revision      = 1,
         .version       = XTABLES_VERSION,
         .size          = XT_ALIGN(sizeof(struct xt_geoip_match_info)),
         .userspacesize = offsetof(struct xt_geoip_match_info, mem),

diff --git a/extensions/libxt_ipp2p.c b/extensions/libxt_ipp2p.c
index 21beee431d3b47d74f819e92d3af1ff3f99a1d16..1e0d3257b85e172ffb0658bc149866c112a66126 100644 (file)
--- a/extensions/libxt_ipp2p.c
+++ b/extensions/libxt_ipp2p.c
@@ -228,7 +228,7 @@ static void ipp2p_mt_save(const void *entry, const struct xt_entry_match *match)
 static struct xtables_match ipp2p_mt_reg = {
        .version       = XTABLES_VERSION,
        .name          = "ipp2p",
-       .revision      = 0,
+       .revision      = 1,
        .family        = AF_INET,
        .size          = XT_ALIGN(sizeof(struct ipt_p2p_info)),
        .userspacesize = XT_ALIGN(sizeof(struct ipt_p2p_info)),

diff --git a/extensions/xt_IPMARK.c b/extensions/xt_IPMARK.c
index c193a6573165bb20a966c5e0bb6ed8b0409be379..07f6ecdcef37b6c362d27cb44b4fd3c0abcad081 100644 (file)
--- a/extensions/xt_IPMARK.c
+++ b/extensions/xt_IPMARK.c
@@ -82,7 +82,7 @@ ipmark_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
 static struct xt_target ipmark_tg_reg[] __read_mostly = {
        {
                .name       = "IPMARK",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV4,
                .table      = "mangle",
                .target     = ipmark_tg4,
@@ -91,7 +91,7 @@ static struct xt_target ipmark_tg_reg[] __read_mostly = {
        },
        {
                .name       = "IPMARK",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV6,
                .table      = "mangle",
                .target     = ipmark_tg6,

diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
index 2e0e6be97d5ced338a79db008c0e3cd2c75e5c47..3cd223bc00eeddbf5f7794933e42d5af83073134 100644 (file)
--- a/extensions/xt_SYSRQ.c
+++ b/extensions/xt_SYSRQ.c
@@ -272,7 +272,7 @@ static bool sysrq_tg_check(const struct xt_tgchk_param *par)
 static struct xt_target sysrq_tg_reg[] __read_mostly = {
        {
                .name       = "SYSRQ",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV4,
                .target     = sysrq_tg4,
                .checkentry = sysrq_tg_check,
@@ -280,7 +280,7 @@ static struct xt_target sysrq_tg_reg[] __read_mostly = {
        },
        {
                .name       = "SYSRQ",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV6,
                .target     = sysrq_tg6,
                .checkentry = sysrq_tg_check,

diff --git a/extensions/xt_condition.c b/extensions/xt_condition.c
index 28792a46d406eb1b3a0699cf55362baea45a130e..20ed7340c8028d2dc115ccc695d3832798bfa80a 100644 (file)
--- a/extensions/xt_condition.c
+++ b/extensions/xt_condition.c
@@ -206,7 +206,7 @@ static void condition_mt_destroy(const struct xt_mtdtor_param *par)
 static struct xt_match condition_mt_reg[] __read_mostly = {
        {
                .name       = "condition",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV4,
                .matchsize  = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
                .match      = condition_mt,
@@ -216,7 +216,7 @@ static struct xt_match condition_mt_reg[] __read_mostly = {
        },
        {
                .name       = "condition",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV6,
                .matchsize  = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
                .match      = condition_mt,

diff --git a/extensions/xt_fuzzy.c b/extensions/xt_fuzzy.c
index 237af67beb418f66db8a7bb2d506fa7c441a8f75..065a30596b188419c1c4bac0c566b18c353627eb 100644 (file)
--- a/extensions/xt_fuzzy.c
+++ b/extensions/xt_fuzzy.c
@@ -142,7 +142,7 @@ static bool fuzzy_mt_check(const struct xt_mtchk_param *par)
 static struct xt_match fuzzy_mt_reg[] __read_mostly = {
        {
                .name       = "fuzzy",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV4,
                .match      = fuzzy_mt,
                .checkentry = fuzzy_mt_check,
@@ -151,7 +151,7 @@ static struct xt_match fuzzy_mt_reg[] __read_mostly = {
        },
        {
                .name       = "fuzzy",
-               .revision   = 0,
+               .revision   = 1,
                .family     = NFPROTO_IPV6,
                .match      = fuzzy_mt,
                .checkentry = fuzzy_mt_check,

diff --git a/extensions/xt_geoip.c b/extensions/xt_geoip.c
index 19c4b1c7fe76497427561897568ca8ddd5890e0f..8b9420d6e0d336a49a37db2d6f2d50765442b694 100644 (file)
--- a/extensions/xt_geoip.c
+++ b/extensions/xt_geoip.c
@@ -222,7 +222,7 @@ static void xt_geoip_mt_destroy(const struct xt_mtdtor_param *par)
 
 static struct xt_match xt_geoip_match __read_mostly = {
        .name       = "geoip",
-       .revision   = 0,
+       .revision   = 1,
        .family     = NFPROTO_IPV4,
        .match      = xt_geoip_mt,
        .checkentry = xt_geoip_mt_checkentry,

diff --git a/extensions/xt_ipp2p.c b/extensions/xt_ipp2p.c
index 83fa201be10e092cf49012727847af397a2b31f1..c0a364d0c3fd0b118ee2a44b3085beb7756a22d1 100644 (file)
--- a/extensions/xt_ipp2p.c
+++ b/extensions/xt_ipp2p.c
@@ -890,7 +890,7 @@ ipp2p_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 
 static struct xt_match ipp2p_mt_reg __read_mostly = {
        .name       = "ipp2p",
-       .revision   = 0,
+       .revision   = 1,
        .family     = NFPROTO_IPV4,
        .match      = ipp2p_mt,
        .matchsize  = sizeof(struct ipt_p2p_info),