diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /drivers/net/loopback.c | |
| parent | 076d8423a98659a92837b07aa494cb74bfefe77c (diff) | |
| parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/loopback.c')
| -rw-r--r-- | drivers/net/loopback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index f2a6e7132241..41b774baac4d 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
| @@ -258,7 +258,7 @@ static __net_init int loopback_net_init(struct net *net) | |||
| 258 | if (!dev) | 258 | if (!dev) |
| 259 | goto out; | 259 | goto out; |
| 260 | 260 | ||
| 261 | dev->nd_net = net; | 261 | dev_net_set(dev, net); |
| 262 | err = register_netdev(dev); | 262 | err = register_netdev(dev); |
| 263 | if (err) | 263 | if (err) |
| 264 | goto out_free_netdev; | 264 | goto out_free_netdev; |