git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
pcap_kern.c
diff --git
a/arch/um/drivers/pcap_kern.c
b/arch/um/drivers/pcap_kern.c
index
3a750dd
..
2860525
100644
(file)
--- 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)
struct pcap_data *ppri;
struct pcap_init *init = data;
- pri =
dev->priv
;
+ pri =
netdev_priv(dev)
;
ppri = (struct pcap_data *) pri->user;
ppri->host_if = init->host_if;
ppri->promisc = init->promisc;