netfilter: xtables: remove xt_TOS v0

Superseded by xt_TOS v1 (v2.6.24-2396-g5c350e5).

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f8cd450be9aa83a4a88cee408f79378ef575ce18..3aa4a779092b186bb21421131df3d30642f63043 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -235,9 +235,6 @@ Who:        Thomas Gleixner <tglx@linutronix.de>
 ---------------------------
 
 What (Why):
-       - include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files
-         (superseded by xt_TOS/xt_tos target & match)
-
        - "forwarding" header files like ipt_mac.h in
          include/linux/netfilter_ipv4/ and include/linux/netfilter_ipv6/
 

diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index 3a7105bb8f33eac65084e2cd62323f5491a02f18..86d81a285f9c0c111f35825caab1e414d2a6bd19 100644 (file)
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -9,7 +9,6 @@ header-y += ipt_NFQUEUE.h
 header-y += ipt_REJECT.h
 header-y += ipt_SAME.h
 header-y += ipt_TCPMSS.h
-header-y += ipt_TOS.h
 header-y += ipt_TTL.h
 header-y += ipt_ULOG.h
 header-y += ipt_addrtype.h
@@ -40,7 +39,6 @@ header-y += ipt_sctp.h
 header-y += ipt_state.h
 header-y += ipt_string.h
 header-y += ipt_tcpmss.h
-header-y += ipt_tos.h
 header-y += ipt_ttl.h
 
 unifdef-y += ip_queue.h

diff --git a/include/linux/netfilter_ipv4/ipt_TOS.h b/include/linux/netfilter_ipv4/ipt_TOS.h
deleted file mode 100644 (file)
index 6bf9e1f..0000000
--- a/include/linux/netfilter_ipv4/ipt_TOS.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _IPT_TOS_H_target
-#define _IPT_TOS_H_target
-
-#ifndef IPTOS_NORMALSVC
-#define IPTOS_NORMALSVC 0
-#endif
-
-struct ipt_tos_target_info {
-       u_int8_t tos;
-};
-
-#endif /*_IPT_TOS_H_target*/

diff --git a/include/linux/netfilter_ipv4/ipt_tos.h b/include/linux/netfilter_ipv4/ipt_tos.h
deleted file mode 100644 (file)
index a21f5df..0000000
--- a/include/linux/netfilter_ipv4/ipt_tos.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _IPT_TOS_H
-#define _IPT_TOS_H
-
-struct ipt_tos_info {
-    u_int8_t tos;
-    u_int8_t invert;
-};
-
-#ifndef IPTOS_NORMALSVC
-#define IPTOS_NORMALSVC 0
-#endif
-
-#endif /*_IPT_TOS_H*/

diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
index 6a347e768f862ed9a9621dfc23f27cf40b648ad2..74ce892600569020fe077b8e0de83f948d981dc9 100644 (file)
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -18,7 +18,6 @@
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_DSCP.h>
-#include <linux/netfilter_ipv4/ipt_TOS.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("Xtables: DSCP/TOS field modification");
@@ -72,41 +71,6 @@ static bool dscp_tg_check(const struct xt_tgchk_param *par)
        return true;
 }
 
-static unsigned int
-tos_tg_v0(struct sk_buff *skb, const struct xt_target_param *par)
-{
-       const struct ipt_tos_target_info *info = par->targinfo;
-       struct iphdr *iph = ip_hdr(skb);
-       u_int8_t oldtos;
-
-       if ((iph->tos & IPTOS_TOS_MASK) != info->tos) {
-               if (!skb_make_writable(skb, sizeof(struct iphdr)))
-                       return NF_DROP;
-
-               iph      = ip_hdr(skb);
-               oldtos   = iph->tos;
-               iph->tos = (iph->tos & IPTOS_PREC_MASK) | info->tos;
-               csum_replace2(&iph->check, htons(oldtos), htons(iph->tos));
-       }
-
-       return XT_CONTINUE;
-}
-
-static bool tos_tg_check_v0(const struct xt_tgchk_param *par)
-{
-       const struct ipt_tos_target_info *info = par->targinfo;
-       const uint8_t tos = info->tos;
-
-       if (tos != IPTOS_LOWDELAY && tos != IPTOS_THROUGHPUT &&
-           tos != IPTOS_RELIABILITY && tos != IPTOS_MINCOST &&
-           tos != IPTOS_NORMALSVC) {
-               printk(KERN_WARNING "TOS: bad tos value %#x\n", tos);
-               return false;
-       }
-
-       return true;
-}
-
 static unsigned int
 tos_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
@@ -166,16 +130,6 @@ static struct xt_target dscp_tg_reg[] __read_mostly = {
                .table          = "mangle",
                .me             = THIS_MODULE,
        },
-       {
-               .name           = "TOS",
-               .revision       = 0,
-               .family         = NFPROTO_IPV4,
-               .table          = "mangle",
-               .target         = tos_tg_v0,
-               .targetsize     = sizeof(struct ipt_tos_target_info),
-               .checkentry     = tos_tg_check_v0,
-               .me             = THIS_MODULE,
-       },
        {
                .name           = "TOS",
                .revision       = 1,

diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c
index c3f8085460d774feaaef8246e37bd596e880e650..0280d3a8c16172bc924f53b233c4527fe6b1e7b0 100644 (file)
--- a/net/netfilter/xt_dscp.c
+++ b/net/netfilter/xt_dscp.c
@@ -15,7 +15,6 @@
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_dscp.h>
-#include <linux/netfilter_ipv4/ipt_tos.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("Xtables: DSCP/TOS field match");
@@ -55,14 +54,6 @@ static bool dscp_mt_check(const struct xt_mtchk_param *par)
        return true;
 }
 
-static bool
-tos_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
-{
-       const struct ipt_tos_info *info = par->matchinfo;
-
-       return (ip_hdr(skb)->tos == info->tos) ^ info->invert;
-}
-
 static bool tos_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
        const struct xt_tos_match_info *info = par->matchinfo;
@@ -92,14 +83,6 @@ static struct xt_match dscp_mt_reg[] __read_mostly = {
                .matchsize      = sizeof(struct xt_dscp_info),
                .me             = THIS_MODULE,
        },
-       {
-               .name           = "tos",
-               .revision       = 0,
-               .family         = NFPROTO_IPV4,
-               .match          = tos_mt_v0,
-               .matchsize      = sizeof(struct ipt_tos_info),
-               .me             = THIS_MODULE,
-       },
        {
                .name           = "tos",
                .revision       = 1,