git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...
[sfrench/cifs-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_queue.c
diff --git
a/net/ipv4/netfilter/ip_queue.c
b/net/ipv4/netfilter/ip_queue.c
index aa33a4a7a7154e52de8f57e9906d4f6d62d15f63..432ce9d1c11c48268bad47c14345305756aca95c 100644
(file)
--- a/
net/ipv4/netfilter/ip_queue.c
+++ b/
net/ipv4/netfilter/ip_queue.c
@@
-477,7
+477,7
@@
ipq_rcv_dev_event(struct notifier_block *this,
{
struct net_device *dev = ptr;
- if (
dev_net(dev) != &init_net
)
+ if (
!net_eq(dev_net(dev), &init_net)
)
return NOTIFY_DONE;
/* Drop any packets associated with the downed device */