diff options
author | Thomas Graf <tgraf@suug.ch> | 2006-11-09 15:19:14 -0800 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:21:38 -0800 |
commit | 82e91ffef60e6eba9848fe149ce1eecd2b5aef12 (patch) | |
tree | 9ccc6a518a1f678ae15cfb3a59c05127286cff96 /net/ipv4/netfilter/ip_queue.c | |
parent | 0afc46c4683df512eef34a71a85065dc555c2af2 (diff) | |
download | talos-op-linux-82e91ffef60e6eba9848fe149ce1eecd2b5aef12.tar.gz talos-op-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/ipv4/netfilter/ip_queue.c')
-rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index 97556cc2e4e0..cd520df4dcf4 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c @@ -243,7 +243,7 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp) pmsg->data_len = data_len; pmsg->timestamp_sec = entry->skb->tstamp.off_sec; pmsg->timestamp_usec = entry->skb->tstamp.off_usec; - pmsg->mark = entry->skb->nfmark; + pmsg->mark = entry->skb->mark; pmsg->hook = entry->info->hook; pmsg->hw_protocol = entry->skb->protocol; |