Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c

1 files changed, 8 insertions, 25 deletions

diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 802b3a38b041..89f0c2b5f405 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -82,6 +82,8 @@ enum
         __ICMP_MIB_MAX
 };
 
+#define __ICMPMSG_MIB_MAX 512   /* Out+In for all 8-bit ICMP types */
+
 /* icmp6 mib definitions */
 /*
  * RFC 2466:  ICMPv6-MIB
@@ -91,35 +93,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
@@ -231,6 +210,10 @@ enum
         LINUX_MIB_TCPABORTONLINGER,             /* TCPAbortOnLinger */
         LINUX_MIB_TCPABORTFAILED,               /* TCPAbortFailed */
         LINUX_MIB_TCPMEMORYPRESSURES,           /* TCPMemoryPressures */
+        LINUX_MIB_TCPSACKDISCARD,               /* TCPSACKDiscard */
+        LINUX_MIB_TCPDSACKIGNOREDOLD,           /* TCPSACKIgnoredOld */
+        LINUX_MIB_TCPDSACKIGNOREDNOUNDO,        /* TCPSACKIgnoredNoUndo */
+        LINUX_MIB_TCPSPURIOUSRTOS,              /* TCPSpuriousRTOs */
         __LINUX_MIB_MAX
 };