mirror of
https://github.com/fail0verflow/switch-linux.git
synced 2025-05-04 02:34:21 -04:00
[SCTP]: 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 <xemul@openvz.org> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cd557bc1c1
commit
3f5340a67e
1 changed files with 2 additions and 21 deletions
|
@ -38,6 +38,7 @@
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <net/sctp/sctp.h>
|
#include <net/sctp/sctp.h>
|
||||||
|
#include <net/ip.h> /* for snmp_fold_field */
|
||||||
|
|
||||||
static struct snmp_mib sctp_snmp_list[] = {
|
static struct snmp_mib sctp_snmp_list[] = {
|
||||||
SNMP_MIB_ITEM("SctpCurrEstab", SCTP_MIB_CURRESTAB),
|
SNMP_MIB_ITEM("SctpCurrEstab", SCTP_MIB_CURRESTAB),
|
||||||
|
@ -75,26 +76,6 @@ static struct snmp_mib sctp_snmp_list[] = {
|
||||||
SNMP_MIB_SENTINEL
|
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). */
|
/* Display sctp snmp mib statistics(/proc/net/sctp/snmp). */
|
||||||
static int sctp_snmp_seq_show(struct seq_file *seq, void *v)
|
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++)
|
for (i = 0; sctp_snmp_list[i].name != NULL; i++)
|
||||||
seq_printf(seq, "%-32s\t%ld\n", sctp_snmp_list[i].name,
|
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));
|
sctp_snmp_list[i].entry));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Reference in a new issue