Merge branch 'tracing/core-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/frede...

[deliverable/linux.git] / net / netfilter / xt_dscp.c

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,