diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-25 19:43:59 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-25 19:43:59 -0700 |
commit | dfe98e9214ced45cd1a6ecd19f2627819a630f77 (patch) | |
tree | 4a229937bc32c470ebb75a51bdd39572d91ac0ce /net/irda/irlap_frame.c | |
parent | f89e6e3834035c6e8203042f3527931aa7f52496 (diff) | |
parent | 878628fbf2589eb24357e42027d5f54b1dafd3c8 (diff) |
Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
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 a38b231c868..90894534f3c 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->nd_net != &init_net) + if (dev_net(dev) != &init_net) goto out; /* FIXME: should we get our own field? */ |