[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>
This commit is contained in:

committed by
David S. Miller

parent
0afc46c468
commit
82e91ffef6
@@ -101,11 +101,7 @@ static int fw_classify(struct sk_buff *skb, struct tcf_proto *tp,
|
||||
struct fw_head *head = (struct fw_head*)tp->root;
|
||||
struct fw_filter *f;
|
||||
int r;
|
||||
#ifdef CONFIG_NETFILTER
|
||||
u32 id = skb->nfmark & head->mask;
|
||||
#else
|
||||
u32 id = 0;
|
||||
#endif
|
||||
u32 id = skb->mark & head->mask;
|
||||
|
||||
if (head != NULL) {
|
||||
for (f=head->ht[fw_hash(id)]; f; f=f->next) {
|
||||
|
Reference in New Issue
Block a user