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/pcap_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/pcap_kern.c')
| -rw-r--r-- | arch/um/drivers/pcap_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c index 3a750dd39be1..2860525f8ff6 100644 --- a/arch/um/drivers/pcap_kern.c +++ b/arch/um/drivers/pcap_kern.c | |||
| @@ -21,7 +21,7 @@ void pcap_init(struct net_device *dev, void *data) | |||
| 21 | struct pcap_data *ppri; | 21 | struct pcap_data *ppri; |
| 22 | struct pcap_init *init = data; | 22 | struct pcap_init *init = data; |
| 23 | 23 | ||
| 24 | pri = dev->priv; | 24 | pri = netdev_priv(dev); |
| 25 | ppri = (struct pcap_data *) pri->user; | 25 | ppri = (struct pcap_data *) pri->user; |
| 26 | ppri->host_if = init->host_if; | 26 | ppri->host_if = init->host_if; |
| 27 | ppri->promisc = init->promisc; | 27 | ppri->promisc = init->promisc; |