From: Jan Engelhardt <jengelh@computergmbh.de>
Date: Wed, 5 Dec 2007 07:37:54 +0000 (-0800)
Subject: [NETFILTER]: Merge ipt_tos into xt_dscp
X-Git-Tag: v2.6.25-rc1~1162^2~1259
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3b33e6a2cdefba38d83442ebae2ee42e853ea51;p=pandora-kernel.git

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

Reading git-diff-tree failed