Skip to content
Snippets Groups Projects
Verified Commit 69025a71 authored by minute's avatar minute
Browse files

another fix for 6.11

parent cb423f49
Branches binary-deb
No related tags found
No related merge requests found
Pipeline #3176 failed
...@@ -162,7 +162,7 @@ typedef unsigned long TQUEUE_ARG; ...@@ -162,7 +162,7 @@ typedef unsigned long TQUEUE_ARG;
#define mark_bh(a) #define mark_bh(a)
#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \ #define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
f(struct ctl_table *ctl, int write, void *buffer, \ f(const struct ctl_table *ctl, int write, void *buffer, \
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ #define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
proc_dointvec(ctl, write, buffer, lenp, ppos) proc_dointvec(ctl, write, buffer, lenp, ppos)
......
...@@ -235,6 +235,7 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ...@@ -235,6 +235,7 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp,
int ret, enable; int ret, enable;
ol_ath_generic_softc_handle scn; ol_ath_generic_softc_handle scn;
struct ol_pktlog_dev_t *pl_dev; struct ol_pktlog_dev_t *pl_dev;
struct ctl_table* ctl_rw = (struct ctl_table*)ctl;
mutex_lock(&proc_mutex); mutex_lock(&proc_mutex);
scn = (ol_ath_generic_softc_handle) ctl->extra1; scn = (ol_ath_generic_softc_handle) ctl->extra1;
...@@ -255,11 +256,11 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ...@@ -255,11 +256,11 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp,
return -ENODEV; return -ENODEV;
} }
ctl->data = &enable; ctl_rw->data = &enable;
ctl->maxlen = sizeof(enable); ctl_rw->maxlen = sizeof(enable);
if (write) { if (write) {
ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, ret = ATH_SYSCTL_PROC_DOINTVEC(ctl_rw, write, filp, buffer,
lenp, ppos); lenp, ppos);
if (ret == 0) if (ret == 0)
ret = pl_dev->pl_funcs->pktlog_enable( ret = pl_dev->pl_funcs->pktlog_enable(
...@@ -269,15 +270,15 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ...@@ -269,15 +270,15 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp,
printk(PKTLOG_TAG "%s:proc_dointvec failed\n", printk(PKTLOG_TAG "%s:proc_dointvec failed\n",
__func__); __func__);
} else { } else {
ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, ret = ATH_SYSCTL_PROC_DOINTVEC(ctl_rw, write, filp, buffer,
lenp, ppos); lenp, ppos);
if (ret) if (ret)
printk(PKTLOG_TAG "%s:proc_dointvec failed\n", printk(PKTLOG_TAG "%s:proc_dointvec failed\n",
__func__); __func__);
} }
ctl->data = NULL; ctl_rw->data = NULL;
ctl->maxlen = 0; ctl_rw->maxlen = 0;
mutex_unlock(&proc_mutex); mutex_unlock(&proc_mutex);
return ret; return ret;
...@@ -296,6 +297,7 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ...@@ -296,6 +297,7 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp,
int ret, size; int ret, size;
ol_ath_generic_softc_handle scn; ol_ath_generic_softc_handle scn;
struct ol_pktlog_dev_t *pl_dev; struct ol_pktlog_dev_t *pl_dev;
struct ctl_table* ctl_rw = (struct ctl_table*)ctl;
mutex_lock(&proc_mutex); mutex_lock(&proc_mutex);
scn = (ol_ath_generic_softc_handle) ctl->extra1; scn = (ol_ath_generic_softc_handle) ctl->extra1;
...@@ -316,11 +318,11 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ...@@ -316,11 +318,11 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp,
return -ENODEV; return -ENODEV;
} }
ctl->data = &size; ctl_rw->data = &size;
ctl->maxlen = sizeof(size); ctl_rw->maxlen = sizeof(size);
if (write) { if (write) {
ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, ret = ATH_SYSCTL_PROC_DOINTVEC(ctl_rw, write, filp, buffer,
lenp, ppos); lenp, ppos);
if (ret == 0) if (ret == 0)
ret = pl_dev->pl_funcs->pktlog_setsize( ret = pl_dev->pl_funcs->pktlog_setsize(
...@@ -328,12 +330,12 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ...@@ -328,12 +330,12 @@ ATH_SYSCTL_DECL(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp,
size); size);
} else { } else {
size = get_pktlog_bufsize(pl_dev); size = get_pktlog_bufsize(pl_dev);
ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, ret = ATH_SYSCTL_PROC_DOINTVEC(ctl_rw, write, filp, buffer,
lenp, ppos); lenp, ppos);
} }
ctl->data = NULL; ctl_rw->data = NULL;
ctl->maxlen = 0; ctl_rw->maxlen = 0;
mutex_unlock(&proc_mutex); mutex_unlock(&proc_mutex);
return ret; return ret;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment