diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/um/drivers/daemon_kern.c | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/drivers/daemon_kern.c')
| -rw-r--r-- | arch/um/drivers/daemon_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c index d53ff52bb404..b4a1522f2157 100644 --- a/arch/um/drivers/daemon_kern.c +++ b/arch/um/drivers/daemon_kern.c | |||
| @@ -22,7 +22,7 @@ static void daemon_init(struct net_device *dev, void *data) | |||
| 22 | struct daemon_data *dpri; | 22 | struct daemon_data *dpri; |
| 23 | struct daemon_init *init = data; | 23 | struct daemon_init *init = data; |
| 24 | 24 | ||
| 25 | pri = dev->priv; | 25 | pri = netdev_priv(dev); |
| 26 | dpri = (struct daemon_data *) pri->user; | 26 | dpri = (struct daemon_data *) pri->user; |
| 27 | dpri->sock_type = init->sock_type; | 27 | dpri->sock_type = init->sock_type; |
| 28 | dpri->ctl_sock = init->ctl_sock; | 28 | dpri->ctl_sock = init->ctl_sock; |