diff options
author | Patrick McHardy <kaber@trash.net> | 2009-08-10 17:14:59 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-08-10 17:14:59 +0200 |
commit | dc05a564ab1b3a1957927da50912964b61f7da69 (patch) | |
tree | 489905675f9954e5bf160a2eff6ea6ce93472d61 /net/netfilter/xt_dscp.c | |
parent | netfilter: ebtables: Use %pM conversion specifier (diff) | |
parent | netfilter: xtables: check for standard verdicts in policies (diff) | |
download | linux-dev-dc05a564ab1b3a1957927da50912964b61f7da69.tar.xz linux-dev-dc05a564ab1b3a1957927da50912964b61f7da69.zip |
Merge branch 'master' of git://dev.medozas.de/linux
Diffstat (limited to 'net/netfilter/xt_dscp.c')
-rw-r--r-- | net/netfilter/xt_dscp.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c index c3f8085460d7..0280d3a8c161 100644 --- 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; @@ -94,14 +85,6 @@ static struct xt_match dscp_mt_reg[] __read_mostly = { }, { .name = "tos", - .revision = 0, - .family = NFPROTO_IPV4, - .match = tos_mt_v0, - .matchsize = sizeof(struct ipt_tos_info), - .me = THIS_MODULE, - }, - { - .name = "tos", .revision = 1, .family = NFPROTO_IPV4, .match = tos_mt, |