diff options
| author |   Jan Engelhardt <jengelh@computergmbh.de> | 2007-12-04 23:37:54 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 14:55:58 -0800 |
| commit | c3b33e6a2cdefba38d83442ebae2ee42e853ea51 (patch) | |
| tree | 94035811ab565178e10b7db09b489f7d40dad37b /net/ipv4/netfilter/Makefile | |
| parent | [NET]: Constify include/net/dsfield.h (diff) | |
| download | linux-dev-c3b33e6a2cdefba38d83442ebae2ee42e853ea51.tar.xz linux-dev-c3b33e6a2cdefba38d83442ebae2ee42e853ea51.zip | |
[NETFILTER]: Merge ipt_tos into xt_dscp
Merge ipt_tos into xt_dscp.
Merge ipt_tos (tos v0 match) into xt_dscp. They both match on the same
field in the IPv4 header, so it seems reasonable to keep them in one
piece. This is part one of the implicit 4-patch series to move tos to
xtables and extend it by IPv6.
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/Makefile')
| -rw-r--r-- | net/ipv4/netfilter/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile index 42199e93b86c..00c19c74ce77 100644 --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile @@ -46,7 +46,6 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o -obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o # targets |