[NET] use SNMP_MIB_ITEM for MIB description.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

[NET] use SNMP_MIB_ITEM for MIB description.
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
08e5fc0a · Hideaki Yoshifuji · 01b72229 · 08e5fc0a · 08e5fc0a
Commit 08e5fc0a authored Jul 09, 2004 by Hideaki Yoshifuji
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 204 additions and 99 deletions

net/ipv4/proc.c net/ipv4/proc.c +182 -76

net/sctp/proc.c net/sctp/proc.c +22 -23

No files found.
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -39,26 +39,24 @@
 #include <linux/init.h>
 #include <net/sctp/sctp.h>
-static char *sctp_snmp_list[] = {
+struct snmp_mib sctp_snmp_list[] = {
-#define SCTP_SNMP_ENTRY(x) #x 
+	SNMP_MIB_ITEM("SctpCurrEstab", SCTP_MIB_CURRESTAB),
-	SCTP_SNMP_ENTRY(SctpCurrEstab),
+	SNMP_MIB_ITEM("SctpActiveEstabs", SCTP_MIB_ACTIVEESTABS),
-	SCTP_SNMP_ENTRY(SctpActiveEstabs),
+	SNMP_MIB_ITEM("SctpPassiveEstabs", SCTP_MIB_PASSIVEESTABS),
-	SCTP_SNMP_ENTRY(SctpPassiveEstabs),
+	SNMP_MIB_ITEM("SctpAborteds", SCTP_MIB_ABORTEDS),
-	SCTP_SNMP_ENTRY(SctpAborteds),
+	SNMP_MIB_ITEM("SctpShutdowns", SCTP_MIB_SHUTDOWNS),
-	SCTP_SNMP_ENTRY(SctpShutdowns),
+	SNMP_MIB_ITEM("SctpOutOfBlues", SCTP_MIB_OUTOFBLUES),
-	SCTP_SNMP_ENTRY(SctpOutOfBlues),
+	SNMP_MIB_ITEM("SctpChecksumErrors", SCTP_MIB_CHECKSUMERRORS),
-	SCTP_SNMP_ENTRY(SctpChecksumErrors),
+	SNMP_MIB_ITEM("SctpOutCtrlChunks", SCTP_MIB_OUTCTRLCHUNKS),
-	SCTP_SNMP_ENTRY(SctpOutCtrlChunks),
+	SNMP_MIB_ITEM("SctpOutOrderChunks", SCTP_MIB_OUTORDERCHUNKS),
-	SCTP_SNMP_ENTRY(SctpOutOrderChunks),
+	SNMP_MIB_ITEM("SctpOutUnorderChunks", SCTP_MIB_OUTUNORDERCHUNKS),
-	SCTP_SNMP_ENTRY(SctpOutUnorderChunks),
+	SNMP_MIB_ITEM("SctpInCtrlChunks", SCTP_MIB_INCTRLCHUNKS),
-	SCTP_SNMP_ENTRY(SctpInCtrlChunks),
+	SNMP_MIB_ITEM("SctpInOrderChunks", SCTP_MIB_INORDERCHUNKS),
-	SCTP_SNMP_ENTRY(SctpInOrderChunks),
+	SNMP_MIB_ITEM("SctpInUnorderChunks", SCTP_MIB_INUNORDERCHUNKS),
-	SCTP_SNMP_ENTRY(SctpInUnorderChunks),
+	SNMP_MIB_ITEM("SctpFragUsrMsgs", SCTP_MIB_FRAGUSRMSGS),
-	SCTP_SNMP_ENTRY(SctpFragUsrMsgs),
+	SNMP_MIB_ITEM("SctpReasmUsrMsgs", SCTP_MIB_REASMUSRMSGS),
-	SCTP_SNMP_ENTRY(SctpReasmUsrMsgs),
+	SNMP_MIB_ITEM("SctpOutSCTPPacks", SCTP_MIB_OUTSCTPPACKS),
-	SCTP_SNMP_ENTRY(SctpOutSCTPPacks),
+	SNMP_MIB_ITEM("SctpInSCTPPacks", SCTP_MIB_INSCTPPACKS),
-	SCTP_SNMP_ENTRY(SctpInSCTPPacks),
-#undef SCTP_SNMP_ENTRY
 };
 /* Return the current value of a particular entry in the mib by adding its
@@ -88,9 +86,10 @@ static int sctp_snmp_seq_show(struct seq_file *seq, void *v)
 {
 	int i;
-	for (i = 0; i < sizeof(sctp_snmp_list) / sizeof(char *); i++)
+	for (i = 0; sctp_snmp_list[i].name != NULL; i++)
-		seq_printf(seq, "%-32s\t%ld\n", sctp_snmp_list[i],
+		seq_printf(seq, "%-32s\t%ld\n", sctp_snmp_list[i].name,
-			   fold_field((void **)sctp_statistics, i));
+			   fold_field((void **)sctp_statistics, 
+				      sctp_snmp_list[i].entry));
 	return 0;
 }