tree 94035811ab565178e10b7db09b489f7d40dad37b
parent 3c3f486603438130b93b33acd92db0f994ec3e55
author Jan Engelhardt <jengelh@computergmbh.de> 1196840274 -0800
committer David S. Miller <davem@davemloft.net> 1201560958 -0800

[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>