git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull platform-drivers into test branch
[pandora-kernel.git]
/
net
/
ipv4
/
netfilter
/
ipt_ULOG.c
diff --git
a/net/ipv4/netfilter/ipt_ULOG.c
b/net/ipv4/netfilter/ipt_ULOG.c
index
2b104ea
..
dbd3478
100644
(file)
--- a/
net/ipv4/netfilter/ipt_ULOG.c
+++ b/
net/ipv4/netfilter/ipt_ULOG.c
@@
-239,7
+239,7
@@
static void ipt_ulog_packet(unsigned int hooknum,
pm->data_len = copy_len;
pm->timestamp_sec = skb->tstamp.off_sec;
pm->timestamp_usec = skb->tstamp.off_usec;
- pm->mark = skb->
nf
mark;
+ pm->mark = skb->mark;
pm->hook = hooknum;
if (prefix != NULL)
strncpy(pm->prefix, prefix, sizeof(pm->prefix));