From 33a6712d5f09566c2c392b7d006fec2ad70381b4 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 4 Feb 2006 02:14:24 -0800 Subject: [PATCH] --- yaml --- r: 19823 b: refs/heads/master c: a706124d0a4d9daaf6b705d01de3aff18deecea8 h: refs/heads/master i: 19821: 8e8407f677b8bb198e8d88ba2ce196dff99865bc 19819: 36fd208f7ec43ef00c23cdd78e6adb3fa3dbb50f 19815: 62d84ff7c1ed99b34fbb85a68f9a22a0c026aa77 19807: d5d4516c06b302ab6bdf46fa47a9e2783cc98959 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink_queue.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8df5b0cd2bb7..7f15be2102f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad2ad0f96546d6d56b2665bcc863c33ae57c49c4 +refs/heads/master: a706124d0a4d9daaf6b705d01de3aff18deecea8 diff --git a/trunk/net/netfilter/nfnetlink_queue.c b/trunk/net/netfilter/nfnetlink_queue.c index 18ed9c5d209c..cac38b2e147a 100644 --- a/trunk/net/netfilter/nfnetlink_queue.c +++ b/trunk/net/netfilter/nfnetlink_queue.c @@ -825,7 +825,8 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb, } if (nfqa[NFQA_MARK-1]) - skb->nfmark = ntohl(*(u_int32_t *)NFA_DATA(nfqa[NFQA_MARK-1])); + entry->skb->nfmark = ntohl(*(u_int32_t *) + NFA_DATA(nfqa[NFQA_MARK-1])); issue_verdict(entry, verdict); instance_put(queue);