diff options
| author | Thomas Graf <tgraf@suug.ch> | 2006-11-10 00:19:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 06:21:38 +0100 |
| commit | 82e91ffef60e6eba9848fe149ce1eecd2b5aef12 (patch) | |
| tree | 9ccc6a518a1f678ae15cfb3a59c05127286cff96 /net/sched/cls_u32.c | |
| parent | [DECNET]: Don't clear memory twice. (diff) | |
| download | linux-82e91ffef60e6eba9848fe149ce1eecd2b5aef12.tar.xz linux-82e91ffef60e6eba9848fe149ce1eecd2b5aef12.zip | |
[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/sched/cls_u32.c')
| -rw-r--r-- | net/sched/cls_u32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 0a6cfa0005be..8b5194801995 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -143,7 +143,7 @@ next_knode: #endif #ifdef CONFIG_CLS_U32_MARK - if ((skb->nfmark & n->mark.mask) != n->mark.val) { + if ((skb->mark & n->mark.mask) != n->mark.val) { n = n->next; goto next_knode; } else { |