[NETFILTER]: Merge ipt_tos into xt_dscp
authorJan Engelhardt <jengelh@computergmbh.de>
Wed, 5 Dec 2007 07:37:54 +0000 (23:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:55:58 +0000 (14:55 -0800)
commitc3b33e6a2cdefba38d83442ebae2ee42e853ea51
tree94035811ab565178e10b7db09b489f7d40dad37b
parent3c3f486603438130b93b33acd92db0f994ec3e55
[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>
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/ipt_tos.c [deleted file]
net/netfilter/Kconfig
net/netfilter/xt_dscp.c