summaryrefslogtreecommitdiff
path: root/net/netfilter/xt_mark.c
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2006-11-09 23:19:14 (GMT)
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 05:21:38 (GMT)
commit82e91ffef60e6eba9848fe149ce1eecd2b5aef12 (patch)
tree9ccc6a518a1f678ae15cfb3a59c05127286cff96 /net/netfilter/xt_mark.c
parent0afc46c4683df512eef34a71a85065dc555c2af2 (diff)
downloadlinux-fsl-qoriq-82e91ffef60e6eba9848fe149ce1eecd2b5aef12.tar.xz
[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>
Diffstat (limited to 'net/netfilter/xt_mark.c')
-rw-r--r--net/netfilter/xt_mark.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index 934dddf..dfa1ee6 100644
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -31,7 +31,7 @@ match(const struct sk_buff *skb,
{
const struct xt_mark_info *info = matchinfo;
- return ((skb->nfmark & info->mask) == info->mark) ^ info->invert;
+ return ((skb->mark & info->mask) == info->mark) ^ info->invert;
}
static int