git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
net
/
ipv6
/
netfilter
/
ip6_queue.c
diff --git
a/net/ipv6/netfilter/ip6_queue.c
b/net/ipv6/netfilter/ip6_queue.c
index
8d366f7
..
92a36c9
100644
(file)
--- a/
net/ipv6/netfilter/ip6_queue.c
+++ b/
net/ipv6/netfilter/ip6_queue.c
@@
-484,7
+484,7
@@
ipq_rcv_dev_event(struct notifier_block *this,
{
struct net_device *dev = ptr;
- if (dev
->nd_net
!= &init_net)
+ if (dev
_net(dev)
!= &init_net)
return NOTIFY_DONE;
/* Drop any packets associated with the downed device */