Use proc_create_data to properly pass along data.

This commit is contained in:
Ole Petter Bang 2013-12-02 22:03:25 +01:00
parent c84bc550e8
commit 558835015b

View File

@ -323,12 +323,10 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
read_proc_t *read_proc, void * data) read_proc_t *read_proc, void * data)
{ {
struct file_operations fops = { struct file_operations fops = {
owner: THIS_MODULE,
read: read_proc read: read_proc
}; };
struct proc_dir_entry *res = proc_create(name, mode, base, &fops); struct proc_dir_entry *res = proc_create_data(name, mode, base, &fops, data);
//if (res) {
// res->data = data;
//}
return res; return res;
} }
typedef ssize_t (*write_proc_t) (struct file *, const char __user *, ssize_t, loff_t *); typedef ssize_t (*write_proc_t) (struct file *, const char __user *, ssize_t, loff_t *);
@ -337,13 +335,11 @@ static inline struct proc_dir_entry *create_proc_read_write_entry(const char *na
read_proc_t *read_proc, void * data, write_proc_t *write_proc) read_proc_t *read_proc, void * data, write_proc_t *write_proc)
{ {
struct file_operations fops = { struct file_operations fops = {
owner: THIS_MODULE,
read: read_proc, read: read_proc,
write: write_proc write: write_proc
}; };
struct proc_dir_entry *res = proc_create(name, mode, base, &fops); struct proc_dir_entry *res = proc_create_data(name, mode, base, &fops, data);
//if (res) {
// res->data = data;
//}
return res; return res;
} }
#endif #endif
@ -805,7 +801,7 @@ _func_enter_;
&& (registry_par->channel <= 14)) { && (registry_par->channel <= 14)) {
registry_par->channel = 36; registry_par->channel = 36;
} }
registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ; registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
registry_par->vcs_type = (u8)rtw_vcs_type; registry_par->vcs_type = (u8)rtw_vcs_type;
registry_par->rts_thresh=(u16)rtw_rts_thresh; registry_par->rts_thresh=(u16)rtw_rts_thresh;
@ -2160,7 +2156,7 @@ static const struct net_device_ops rtw_netdev_if2_ops = {
}; };
#endif #endif
_adapter *rtw_drv_if2_init(_adapter *primary_padapter, _adapter *rtw_drv_if2_init(_adapter *primary_padapter,
void (*set_intf_ops)(_adapter *primary_padapter,struct _io_ops *pops)) void (*set_intf_ops)(_adapter *primary_padapter,struct _io_ops *pops))
{ {
int res = _FAIL; int res = _FAIL;