diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 00:43:29 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 00:43:29 (GMT) |
| commit | db6d8c7a4027b48d797b369a53f8470aaeed7063 (patch) | |
| tree | e140c104a89abc2154e1f41a7db8ebecbb6fa0b4 /net/irda/irlap_frame.c | |
| parent | 3a533374283aea50eab3976d8a6d30532175f009 (diff) | |
| parent | fb65a7c091529bfffb1262515252c0d0f6241c5c (diff) | |
| download | linux-fsl-qoriq-db6d8c7a4027b48d797b369a53f8470aaeed7063.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
iucv: Fix bad merging.
net_sched: Add size table for qdiscs
net_sched: Add accessor function for packet length for qdiscs
net_sched: Add qdisc_enqueue wrapper
highmem: Export totalhigh_pages.
ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
net: Use standard structures for generic socket address structures.
ipv6 netns: Make several "global" sysctl variables namespace aware.
netns: Use net_eq() to compare net-namespaces for optimization.
ipv6: remove unused macros from net/ipv6.h
ipv6: remove unused parameter from ip6_ra_control
tcp: fix kernel panic with listening_get_next
tcp: Remove redundant checks when setting eff_sacks
tcp: options clean up
tcp: Fix MD5 signatures for non-linear skbs
sctp: Update sctp global memory limit allocations.
sctp: remove unnecessary byteshifting, calculate directly in big-endian
sctp: Allow only 1 listening socket with SO_REUSEADDR
sctp: Do not leak memory on multiple listen() calls
sctp: Support ipv6only AF_INET6 sockets.
...
Diffstat (limited to 'net/irda/irlap_frame.c')
| -rw-r--r-- | net/irda/irlap_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c index 9089453..f17b65a 100644 --- a/net/irda/irlap_frame.c +++ b/net/irda/irlap_frame.c @@ -1326,7 +1326,7 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev, int command; __u8 control; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) goto out; /* FIXME: should we get our own field? */ |