Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19823
b: refs/heads/master
c: a706124
h: refs/heads/master
i:
  19821: 8e8407f
  19819: 36fd208
  19815: 62d84ff
  19807: d5d4516
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Feb 5, 2006
1 parent 4cb7ce2 commit 33a6712
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad2ad0f96546d6d56b2665bcc863c33ae57c49c4
refs/heads/master: a706124d0a4d9daaf6b705d01de3aff18deecea8
3 changes: 2 additions & 1 deletion trunk/net/netfilter/nfnetlink_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 33a6712

Please sign in to comment.