]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c3b33e6) | patch
[NETFILTER]: Merge ipt_TOS into xt_DSCP
authorJan Engelhardt <jengelh@computergmbh.de>
Wed, 5 Dec 2007 07:38:13 +0000 (23:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:55:59 +0000 (14:55 -0800)
commitc9fd49680954714473d6cbd2546d6ff120f96840
treee848220ea1a3133cb16ec9eb5dbe49cf29e70474tree | snapshot
parentc3b33e6a2cdefba38d83442ebae2ee42e853ea51commit | diff
[NETFILTER]: Merge ipt_TOS into xt_DSCP

Merge ipt_TOS into xt_DSCP.

Merge ipt_TOS (tos v0 target) into xt_DSCP. They both modify the same
field in the IPv4 header, so it seems reasonable to keep them in one
piece. This is part two 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 diff | blob | history
net/ipv4/netfilter/Makefile diff | blob | history
net/netfilter/Kconfig diff | blob | history
net/netfilter/xt_DSCP.c diff | blob | history
Linux 2.6 source tree