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/af_irda.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/af_irda.c')
| -rw-r--r-- | net/irda/af_irda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 6f21a53cb3e..ae54b20d047 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -837,7 +837,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) IRDA_DEBUG(2, "%s()\n", __func__); - err = irda_create(sk->sk_net, newsock, sk->sk_protocol); + err = irda_create(sock_net(sk), newsock, sk->sk_protocol); if (err) return err; |