hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar7-atm: fixup proc fixes 

They were incomplete, so fix them to properly update the function signatures
to what is expected.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Jonas Gorski 2017-10-13 13:17:51 +02:00
parent 889b21f954
commit fce2664f19
6 changed files with 90 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
View File

@ -9,12 +9,43 @@
#define MAX_STR_SIZE 256 #define MAX_STR_SIZE 256
#define DSL_MOD_SIZE 256 #define DSL_MOD_SIZE 256
@@ -333,8 +333,8 @@ static void tn7dsl_chng_modulation(void*
static unsigned int tn7dsl_set_modulation(void* data, int flag);
static void tn7dsl_ctrl_fineGain(int value);
static void tn7dsl_set_fineGainValue(int value);
-static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp,
- void *buffer, size_t * lenp);
+static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer,
+ size_t * lenp, loff_t *ppos);
static void tn7dsl_register_dslss_led(void);
void tn7dsl_dslmod_sysctl_register(void);
void tn7dsl_dslmod_sysctl_unregister(void);
@@ -3398,8 +3398,8 @@ unsigned int tn7dsl_get_memory(unsigned
-static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp,
- void *buffer, size_t *lenp)
+static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer,
+ size_t *lenp, loff_t *ppos)
{
char *ptr;
int ret, len = 0;
@@ -3411,7 +3411,7 @@ static int dslmod_sysctl(ctl_table *ctl,
char mod_req[16] = { '\t' };
char fst_byt;
- if (!*lenp || (filp->f_pos && !write))
+ if (!*lenp || (*ppos && !write))
{
*lenp = 0;
return 0;
@@ -3421,9 +3421,9 @@ static int dslmod_sysctl(ctl_table *ctl, @@ -3421,9 +3421,9 @@ static int dslmod_sysctl(ctl_table *ctl,
*/ */
if(write) if(write)
{ {
- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
+ ret = proc_dostring(ctl, write, buffer, lenp, 0); + ret = proc_dostring(ctl, write, buffer, lenp, ppos);
- switch (ctl->ctl_name) - switch (ctl->ctl_name)
+ switch ((long)ctl->extra2) + switch ((long)ctl->extra2)
@ -26,7 +57,7 @@
{ {
len += sprintf(info+len, mod_req); len += sprintf(info+len, mod_req);
- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
+ ret = proc_dostring(ctl, write, buffer, lenp, 0); + ret = proc_dostring(ctl, write, buffer, lenp, ppos);
} }
return ret; return ret;
} }

10
package/kernel/ar7-atm/patches-D7.04.03.00/220-3.10-update_proc_code.patch
View File

@ -2886,7 +2886,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
k=0; k=0;
for(j=0;j<4;j++) for(j=0;j<4;j++)
{ {
@@ -1468,26 +1488,16 @@ int tn7sar_proc_sar_stat(char* buf, char @@ -1468,26 +1488,18 @@ int tn7sar_proc_sar_stat(char* buf, char
{ {
if((char *)*pSarStat == NULL) if((char *)*pSarStat == NULL)
break; break;
@ -2897,7 +2897,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- k += dBytes; - k += dBytes;
- } - }
+ +
+ k += seq_printf(m, "%s: ",(char *) *pSarStat); + seq_printf(m, "%s: ",(char *) *pSarStat);
+ k += strlen((char *) *pSarStat) + strlen(": ");
pSarStat++; pSarStat++;
- if(len<=limit) - if(len<=limit)
- { - {
@ -2905,7 +2906,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- len += dBytes; - len += dBytes;
- k += dBytes; - k += dBytes;
- } - }
+ k += seq_printf(m, "%s; \n",(char *) *pSarStat); + seq_printf(m, "%s; \n",(char *) *pSarStat);
+ k += strlen((char *) *pSarStat) + strlen("; \n");
pSarStat++; pSarStat++;
if(k > 60) if(k > 60)
@ -2917,7 +2919,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
} }
} }
@@ -1496,9 +1506,22 @@ int tn7sar_proc_sar_stat(char* buf, char @@ -1496,9 +1508,22 @@ int tn7sar_proc_sar_stat(char* buf, char
} }
} }

12
package/kernel/ar7-atm/patches-D7.04.03.00/240-3.18_fixes.patch
View File

@ -4,18 +4,18 @@
static unsigned int tn7dsl_set_modulation(void* data, int flag); static unsigned int tn7dsl_set_modulation(void* data, int flag);
static void tn7dsl_ctrl_fineGain(int value); static void tn7dsl_ctrl_fineGain(int value);
static void tn7dsl_set_fineGainValue(int value); static void tn7dsl_set_fineGainValue(int value);
-static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp, -static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer,
+static int dslmod_sysctl (struct ctl_table * ctl, int write, struct file *filp, +static int dslmod_sysctl (struct ctl_table * ctl, int write, void *buffer,
void *buffer, size_t * lenp); size_t * lenp, loff_t *ppos);
static void tn7dsl_register_dslss_led(void); static void tn7dsl_register_dslss_led(void);
void tn7dsl_dslmod_sysctl_register(void); void tn7dsl_dslmod_sysctl_register(void);
@@ -3308,7 +3308,7 @@ unsigned int tn7dsl_get_memory(unsigned @@ -3308,7 +3308,7 @@ unsigned int tn7dsl_get_memory(unsigned
-static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp, -static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer,
+static int dslmod_sysctl(struct ctl_table *ctl, int write, struct file * filp, +static int dslmod_sysctl(struct ctl_table *ctl, int write, void *buffer,
void *buffer, size_t *lenp) size_t *lenp, loff_t *ppos)
{ {
char *ptr; char *ptr;
@@ -3423,7 +3423,7 @@ static int dslmod_sysctl(ctl_table *ctl, @@ -3423,7 +3423,7 @@ static int dslmod_sysctl(ctl_table *ctl,

35
package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
View File

@ -9,12 +9,43 @@
#define MAX_STR_SIZE 256 #define MAX_STR_SIZE 256
#define DSL_MOD_SIZE 256 #define DSL_MOD_SIZE 256
@@ -350,8 +350,8 @@ static void tn7dsl_chng_modulation(void*
static unsigned int tn7dsl_set_modulation(void* data, int flag);
static void tn7dsl_ctrl_fineGain(int value);
static void tn7dsl_set_fineGainValue(int value);
-static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp,
- void *buffer, size_t * lenp);
+static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer,
+ size_t * lenp, loff_t *ppos);
static void tn7dsl_register_dslss_led(void);
void tn7dsl_dslmod_sysctl_register(void);
void tn7dsl_dslmod_sysctl_unregister(void);
@@ -3582,8 +3582,8 @@ unsigned int tn7dsl_get_memory(unsigned
-static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp,
- void *buffer, size_t *lenp)
+static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer,
+ size_t *lenp, loff_t *ppos)
{
char *ptr;
int ret, len = 0;
@@ -3595,7 +3595,7 @@ static int dslmod_sysctl(ctl_table *ctl,
char mod_req[16] = { '\t' };
char fst_byt;
- if (!*lenp || (filp->f_pos && !write))
+ if (!*lenp || (*ppos && !write))
{
*lenp = 0;
return 0;
@@ -3605,9 +3605,9 @@ static int dslmod_sysctl(ctl_table *ctl, @@ -3605,9 +3605,9 @@ static int dslmod_sysctl(ctl_table *ctl,
*/ */
if(write) if(write)
{ {
- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
+ ret = proc_dostring(ctl, write, buffer, lenp, 0); + ret = proc_dostring(ctl, write, buffer, lenp, ppos);
- switch (ctl->ctl_name) - switch (ctl->ctl_name)
+ switch ((long)ctl->extra2) + switch ((long)ctl->extra2)
@ -26,7 +57,7 @@
{ {
len += sprintf(info+len, mod_req); len += sprintf(info+len, mod_req);
- ret = proc_dostring(ctl, write, filp, buffer, lenp, 0); - ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
+ ret = proc_dostring(ctl, write, buffer, lenp, 0); + ret = proc_dostring(ctl, write, buffer, lenp, ppos);
} }
return ret; return ret;
} }

10
package/kernel/ar7-atm/patches-D7.05.01.00/220-3.10-update_proc_code.patch
View File

@ -3023,7 +3023,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
k=0; k=0;
for(j=0;j<4;j++) for(j=0;j<4;j++)
{ {
@@ -1620,26 +1640,16 @@ int tn7sar_proc_sar_stat(char* buf, char @@ -1620,26 +1640,18 @@ int tn7sar_proc_sar_stat(char* buf, char
{ {
if((char *)*pSarStat == NULL) if((char *)*pSarStat == NULL)
break; break;
@ -3034,7 +3034,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- k += dBytes; - k += dBytes;
- } - }
+ +
+ k += seq_printf(m, "%s: ",(char *) *pSarStat); + seq_printf(m, "%s: ",(char *) *pSarStat);
+ k += strlen((char *) *pSarStat) + strlen(": ");
pSarStat++; pSarStat++;
- if(len<=limit) - if(len<=limit)
- { - {
@ -3042,7 +3043,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- len += dBytes; - len += dBytes;
- k += dBytes; - k += dBytes;
- } - }
+ k += seq_printf(m, "%s; \n",(char *) *pSarStat); + seq_printf(m, "%s; \n",(char *) *pSarStat);
+ k += strlen((char *) *pSarStat) + strlen("; \n");
pSarStat++; pSarStat++;
if(k > 60) if(k > 60)
@ -3054,7 +3056,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
} }
} }
@@ -1648,9 +1658,22 @@ int tn7sar_proc_sar_stat(char* buf, char @@ -1648,9 +1660,22 @@ int tn7sar_proc_sar_stat(char* buf, char
} }
} }

12
package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch
View File

@ -4,18 +4,18 @@
static unsigned int tn7dsl_set_modulation(void* data, int flag); static unsigned int tn7dsl_set_modulation(void* data, int flag);
static void tn7dsl_ctrl_fineGain(int value); static void tn7dsl_ctrl_fineGain(int value);
static void tn7dsl_set_fineGainValue(int value); static void tn7dsl_set_fineGainValue(int value);
-static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp, -static int dslmod_sysctl (ctl_table * ctl, int write, void *buffer,
+static int dslmod_sysctl (struct ctl_table * ctl, int write, struct file *filp, +static int dslmod_sysctl (struct ctl_table * ctl, int write, void *buffer,
void *buffer, size_t * lenp); size_t * lenp, loff_t *ppos);
static void tn7dsl_register_dslss_led(void); static void tn7dsl_register_dslss_led(void);
void tn7dsl_dslmod_sysctl_register(void); void tn7dsl_dslmod_sysctl_register(void);
@@ -3488,7 +3488,7 @@ unsigned int tn7dsl_get_memory(unsigned @@ -3488,7 +3488,7 @@ unsigned int tn7dsl_get_memory(unsigned
-static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp, -static int dslmod_sysctl(ctl_table *ctl, int write, void *buffer,
+static int dslmod_sysctl(struct ctl_table *ctl, int write, struct file * filp, +static int dslmod_sysctl(struct ctl_table *ctl, int write, void *buffer,
void *buffer, size_t *lenp) size_t *lenp, loff_t *ppos)
{ {
char *ptr; char *ptr;
@@ -3603,7 +3603,7 @@ static int dslmod_sysctl(ctl_table *ctl, @@ -3603,7 +3603,7 @@ static int dslmod_sysctl(ctl_table *ctl,