]> bbs.cooldavid.org Git - net-next-2.6.git/commit - net/ipv4/ip_output.c
[NET]: Turn nfmark into generic mark
authorThomas Graf <tgraf@suug.ch>
Thu, 9 Nov 2006 23:19:14 +0000 (15:19 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:21:38 +0000 (21:21 -0800)
commit82e91ffef60e6eba9848fe149ce1eecd2b5aef12
tree9ccc6a518a1f678ae15cfb3a59c05127286cff96
parent0afc46c4683df512eef34a71a85065dc555c2af2
[NET]: Turn nfmark into generic mark

nfmark is being used in various subsystems and has become
the defacto mark field for all kinds of packets. Therefore
it makes sense to rename it to `mark' and remove the
dependency on CONFIG_NETFILTER.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
28 files changed:
include/linux/skbuff.h
net/bridge/netfilter/ebt_mark.c
net/bridge/netfilter/ebt_mark_m.c
net/bridge/netfilter/ebt_ulog.c
net/core/skbuff.c
net/decnet/dn_route.c
net/ipv4/ip_output.c
net/ipv4/ipvs/ip_vs_proto_tcp.c
net/ipv4/ipvs/ip_vs_proto_udp.c
net/ipv4/netfilter.c
net/ipv4/netfilter/ip_queue.c
net/ipv4/netfilter/ipt_REJECT.c
net/ipv4/netfilter/ipt_ULOG.c
net/ipv4/netfilter/iptable_mangle.c
net/ipv4/route.c
net/ipv6/ip6_output.c
net/ipv6/netfilter/ip6_queue.c
net/ipv6/netfilter/ip6table_mangle.c
net/ipv6/route.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c
net/netfilter/xt_CONNMARK.c
net/netfilter/xt_MARK.c
net/netfilter/xt_mark.c
net/sched/Kconfig
net/sched/cls_fw.c
net/sched/cls_u32.c
net/sched/em_meta.c