libertas_uap: fix oopses at proc access.

diff --git a/drivers/net/wireless/libertas_uap/uap_debug.c b/drivers/net/wireless/libertas_uap/uap_debug.c
index a2f6dc9c7a4296e8df94ee4ef5f9c66d0d689b4d..3d52f0e886305ed947709a5656a0500458b45b99 100644 (file)
--- a/drivers/net/wireless/libertas_uap/uap_debug.c
+++ b/drivers/net/wireless/libertas_uap/uap_debug.c
@@ -99,7 +99,7 @@ static int uap_debug_proc_show(struct seq_file *s, void *data) {
     int val = 0;
     int i;
 
-    struct debug_data *d = (struct debug_data *)data;
+    struct debug_data *d = (struct debug_data *)s->private;
 
     if (MODULE_GET == 0)
         return UAP_STATUS_FAILURE;
@@ -138,7 +138,7 @@ static ssize_t uap_debug_proc_write(struct file *f, const char __user *buf, size
     char *p0;
     char *p1;
     char *p2;
-    struct debug_data *d = (struct debug_data *)f->private_data;
+    struct debug_data *d = (struct debug_data *)PDE_DATA(file_inode(f));
 
     if (MODULE_GET == 0)
         return UAP_STATUS_FAILURE;

diff --git a/drivers/net/wireless/libertas_uap/uap_proc.c b/drivers/net/wireless/libertas_uap/uap_proc.c
index d673f5627002c80c3b10b7e659df741c53df5bcd..ed5ed40f071078416cb110e0bb32f60935a8b438 100644 (file)
--- a/drivers/net/wireless/libertas_uap/uap_proc.c
+++ b/drivers/net/wireless/libertas_uap/uap_proc.c
@@ -116,7 +116,7 @@ static int uap_hwstatus_proc_open(struct inode *inode, struct file *file) {
 }
 
 static ssize_t uap_hwstatus_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *data) {
-       struct net_device *netdev = (struct net_device *)data;
+       struct net_device *netdev = (struct net_device *)PDE_DATA(file_inode(file));
        uap_private *priv = (uap_private *) netdev_priv(netdev);
 
        int hwstatus;