projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
[cascardo/linux.git]
/
net
/
netfilter
/
xt_osf.c
diff --git
a/net/netfilter/xt_osf.c
b/net/netfilter/xt_osf.c
index
0778855
..
df8801e
100644
(file)
--- a/
net/netfilter/xt_osf.c
+++ b/
net/netfilter/xt_osf.c
@@
-200,7
+200,7
@@
xt_osf_match_packet(const struct sk_buff *skb, struct xt_action_param *p)
unsigned char opts[MAX_IPOPTLEN];
const struct xt_osf_finger *kf;
const struct xt_osf_user_finger *f;
- struct net *net =
dev_net(p->in ? p->in : p->out)
;
+ struct net *net =
p->net
;
if (!info)
return false;