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/mcast_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/mcast_kern.c')
| -rw-r--r-- | arch/um/drivers/mcast_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c index 8c4378a76d63..ffc6416d5ed7 100644 --- a/arch/um/drivers/mcast_kern.c +++ b/arch/um/drivers/mcast_kern.c | |||
| @@ -28,7 +28,7 @@ static void mcast_init(struct net_device *dev, void *data) | |||
| 28 | struct mcast_data *dpri; | 28 | struct mcast_data *dpri; |
| 29 | struct mcast_init *init = data; | 29 | struct mcast_init *init = data; |
| 30 | 30 | ||
| 31 | pri = dev->priv; | 31 | pri = netdev_priv(dev); |
| 32 | dpri = (struct mcast_data *) pri->user; | 32 | dpri = (struct mcast_data *) pri->user; |
| 33 | dpri->addr = init->addr; | 33 | dpri->addr = init->addr; |
| 34 | dpri->port = init->port; | 34 | dpri->port = init->port; |