1 files changed, 2 insertions, 25 deletions
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index d24c55473821..86977e31548a 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -91,35 +91,12 @@ enum
        ICMP6_MIB_NUM = 0,
        ICMP6_MIB_INMSGS,                       /* InMsgs */
        ICMP6_MIB_INERRORS,                     /* InErrors */
-        ICMP6_MIB_INDESTUNREACHS,               /* InDestUnreachs */
-        ICMP6_MIB_INPKTTOOBIGS,                 /* InPktTooBigs */
-        ICMP6_MIB_INTIMEEXCDS,                  /* InTimeExcds */
-        ICMP6_MIB_INPARMPROBLEMS,               /* InParmProblems */
-        ICMP6_MIB_INECHOS,                      /* InEchos */
-        ICMP6_MIB_INECHOREPLIES,                /* InEchoReplies */
-        ICMP6_MIB_INGROUPMEMBQUERIES,           /* InGroupMembQueries */
-        ICMP6_MIB_INGROUPMEMBRESPONSES,         /* InGroupMembResponses */
-        ICMP6_MIB_INGROUPMEMBREDUCTIONS,        /* InGroupMembReductions */
-        ICMP6_MIB_INROUTERSOLICITS,             /* InRouterSolicits */
-        ICMP6_MIB_INROUTERADVERTISEMENTS,       /* InRouterAdvertisements */
-        ICMP6_MIB_INNEIGHBORSOLICITS,           /* InNeighborSolicits */
-        ICMP6_MIB_INNEIGHBORADVERTISEMENTS,     /* InNeighborAdvertisements */
-        ICMP6_MIB_INREDIRECTS,                  /* InRedirects */
        ICMP6_MIB_OUTMSGS,                      /* OutMsgs */
-        ICMP6_MIB_OUTDESTUNREACHS,              /* OutDestUnreachs */
-        ICMP6_MIB_OUTPKTTOOBIGS,                /* OutPktTooBigs */
-        ICMP6_MIB_OUTTIMEEXCDS,                 /* OutTimeExcds */
-        ICMP6_MIB_OUTPARMPROBLEMS,              /* OutParmProblems */
-        ICMP6_MIB_OUTECHOREPLIES,               /* OutEchoReplies */
-        ICMP6_MIB_OUTROUTERSOLICITS,            /* OutRouterSolicits */
-        ICMP6_MIB_OUTNEIGHBORSOLICITS,          /* OutNeighborSolicits */
-        ICMP6_MIB_OUTNEIGHBORADVERTISEMENTS,    /* OutNeighborAdvertisements */
-        ICMP6_MIB_OUTREDIRECTS,                 /* OutRedirects */
-        ICMP6_MIB_OUTGROUPMEMBRESPONSES,        /* OutGroupMembResponses */
-        ICMP6_MIB_OUTGROUPMEMBREDUCTIONS,       /* OutGroupMembReductions */
        __ICMP6_MIB_MAX
 };
+#define __ICMP6MSG_MIB_MAX 512 /* Out+In for all 8-bit ICMPv6 types */
 /* tcp mib definitions */
 /*
 * RFC 1213:  MIB-II TCP group

diff --git a/include/linux/snmp.h b/include/linux/snmp.h index d24c55473821..86977e31548a 100644 --- a/include/linux/snmp.h +++ b/include/linux/snmp.h
@@ -91,35 +91,12 @@ enum
91	ICMP6_MIB_NUM = 0,	91	ICMP6_MIB_NUM = 0,
92	ICMP6_MIB_INMSGS, /* InMsgs */	92	ICMP6_MIB_INMSGS, /* InMsgs */
93	ICMP6_MIB_INERRORS, /* InErrors */	93	ICMP6_MIB_INERRORS, /* InErrors */
94	ICMP6_MIB_INDESTUNREACHS, /* InDestUnreachs */
95	ICMP6_MIB_INPKTTOOBIGS, /* InPktTooBigs */
96	ICMP6_MIB_INTIMEEXCDS, /* InTimeExcds */
97	ICMP6_MIB_INPARMPROBLEMS, /* InParmProblems */
98	ICMP6_MIB_INECHOS, /* InEchos */
99	ICMP6_MIB_INECHOREPLIES, /* InEchoReplies */
100	ICMP6_MIB_INGROUPMEMBQUERIES, /* InGroupMembQueries */
101	ICMP6_MIB_INGROUPMEMBRESPONSES, /* InGroupMembResponses */
102	ICMP6_MIB_INGROUPMEMBREDUCTIONS, /* InGroupMembReductions */
103	ICMP6_MIB_INROUTERSOLICITS, /* InRouterSolicits */
104	ICMP6_MIB_INROUTERADVERTISEMENTS, /* InRouterAdvertisements */
105	ICMP6_MIB_INNEIGHBORSOLICITS, /* InNeighborSolicits */
106	ICMP6_MIB_INNEIGHBORADVERTISEMENTS, /* InNeighborAdvertisements */
107	ICMP6_MIB_INREDIRECTS, /* InRedirects */
108	ICMP6_MIB_OUTMSGS, /* OutMsgs */	94	ICMP6_MIB_OUTMSGS, /* OutMsgs */
109	ICMP6_MIB_OUTDESTUNREACHS, /* OutDestUnreachs */
110	ICMP6_MIB_OUTPKTTOOBIGS, /* OutPktTooBigs */
111	ICMP6_MIB_OUTTIMEEXCDS, /* OutTimeExcds */
112	ICMP6_MIB_OUTPARMPROBLEMS, /* OutParmProblems */
113	ICMP6_MIB_OUTECHOREPLIES, /* OutEchoReplies */
114	ICMP6_MIB_OUTROUTERSOLICITS, /* OutRouterSolicits */
115	ICMP6_MIB_OUTNEIGHBORSOLICITS, /* OutNeighborSolicits */
116	ICMP6_MIB_OUTNEIGHBORADVERTISEMENTS, /* OutNeighborAdvertisements */
117	ICMP6_MIB_OUTREDIRECTS, /* OutRedirects */
118	ICMP6_MIB_OUTGROUPMEMBRESPONSES, /* OutGroupMembResponses */
119	ICMP6_MIB_OUTGROUPMEMBREDUCTIONS, /* OutGroupMembReductions */
120	__ICMP6_MIB_MAX	95	__ICMP6_MIB_MAX
121	};	96	};
122		97
		98	#define __ICMP6MSG_MIB_MAX 512 /* Out+In for all 8-bit ICMPv6 types */
		99
123	/* tcp mib definitions */	100	/* tcp mib definitions */
124	/*	101	/*
125	* RFC 1213: MIB-II TCP group	102	* RFC 1213: MIB-II TCP group