: Use snmp_fold_field instead of a homebrew analogue.
Subsystems (3)
PATCH 1/2 : Use snmp_fold_field instead of a homebrew analogue.
SCPT already depends in INET, so this doesn't create additional dependencies.
Signed-off-by Pavel Emelyanov <[email protected]>
--- net/sctp/proc.c | 23 ++--------------------- 1 files changed, 2 insertions(+), 21 deletions(-)
net/sctp/proc.c +2 -21
@@ -38,6 +38,7 @@#include <linux/seq_file.h> #include <linux/init.h> #include <net/sctp/sctp.h> +#include <net/ip.h> /* for snmp_fold_field */ static struct snmp_mib sctp_snmp_list[] = {SNMP_MIB_ITEM ("SctpCurrEstab" ,SCTP_MIB_CURRESTAB ),
@@ -75,26 +76,6 @@ static struct snmp_mib sctp_snmp_list[] = { SNMP_MIB_SENTINEL }; -/* Return the current value of a particular entry in the mib by adding its -* per cpu counters. -*/ -static unsigned long -fold_field (void *mib[],int nr) -{ -unsigned long res =0 ; -int i; - -for_each_possible_cpu (i) { - res += - *((unsigned long *) (((void *)per_cpu_ptr (mib[0 ], i)) + -sizeof (unsigned long ) * nr)); - res += - *((unsigned long *) (((void *)per_cpu_ptr (mib[1 ], i)) + -sizeof (unsigned long ) * nr)); - } -return res; -} -/* Display sctp snmp mib statistics(/proc/net/sctp/snmp). */ static int sctp_snmp_seq_show (struct seq_file *seq,void *v) {
@@ -102,7 +83,7 @@ static int sctp_snmp_seq_show(struct seq_file *seq, void *v)for (i =0 ; sctp_snmp_list[i].name !=NULL ; i++)seq_printf (seq,"%-32s\t%ld\n" , sctp_snmp_list[i].name, -fold_field ((void **)sctp_statistics, +snmp_fold_field ((void **)sctp_statistics, sctp_snmp_list[i].entry));return 0 ;
Signature · 1 line
1.5.3.4
Quoted 4 lines · Pavel Emelyanov
SCPT already depends in INET, so this doesn't create additional dependencies.
Signed-off-by Pavel Emelyanov <[email protected]>
Acked-by Vlad Yasevich <[email protected]>
Quoted 53 lines
--- net/sctp/proc.c | 23 ++--------------------- 1 files changed, 2 insertions(+), 21 deletions(-)net/sctp/proc.c +2
-21@@ -38,6 +38,7 @@#include <linux/seq_file.h> #include <linux/init.h> #include <net/sctp/sctp.h> +#include <net/ip.h> /* for snmp_fold_field */ static struct snmp_mib sctp_snmp_list[] = {SNMP_MIB_ITEM ("SctpCurrEstab" ,SCTP_MIB_CURRESTAB ),@@ -75,26 +76,6 @@ static struct snmp_mib sctp_snmp_list[] = { SNMP_MIB_SENTINEL }; -/* Return the current value of a particular entry in the mib by adding its -* per cpu counters. -*/ -static unsigned long -fold_field (void *mib[],int nr) -{ -unsigned long res =0 ; -int i; - -for_each_possible_cpu (i) { - res += - *((unsigned long *) (((void *)per_cpu_ptr (mib[0 ], i)) + -sizeof (unsigned long ) * nr)); - res += - *((unsigned long *) (((void *)per_cpu_ptr (mib[1 ], i)) + -sizeof (unsigned long ) * nr)); - } -return res; -} -/* Display sctp snmp mib statistics(/proc/net/sctp/snmp). */ static int sctp_snmp_seq_show (struct seq_file *seq,void *v) {@@ -102,7 +83,7 @@ static int sctp_snmp_seq_show(struct seq_file *seq, void *v)for (i =0 ; sctp_snmp_list[i].name !=NULL ; i++)seq_printf (seq,"%-32s\t%ld\n" , sctp_snmp_list[i].name, -fold_field ((void **)sctp_statistics, +snmp_fold_field ((void **)sctp_statistics, sctp_snmp_list[i].entry));return 0 ;
From: Vlad Yasevich <[email protected]>
Date: Fri, 08 Feb 2008 09:59:54 -0500
Quoted 7 lines
Quoted 4 lines · Pavel Emelyanov
SCPT already depends in INET, so this doesn't create additional dependencies.
Signed-off-by Pavel Emelyanov <[email protected]>Acked-by Vlad Yasevich <[email protected]>
Applied.