Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
  [IPV6] ADDRLABEL: Fix double free on label deletion.
  [PPP]: Sparse warning fixes.
  [IPV4] fib_trie: remove unneeded NULL check
  [IPV4] fib_trie: More whitespace cleanup.
  [NET_SCHED]: Use nla_policy for attribute validation in ematches
  [NET_SCHED]: Use nla_policy for attribute validation in actions
  [NET_SCHED]: Use nla_policy for attribute validation in classifiers
  [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
  [NET_SCHED]: sch_api: introduce constant for rate table size
  [NET_SCHED]: Use typeful attribute parsing helpers
  [NET_SCHED]: Use typeful attribute construction helpers
  [NET_SCHED]: Use NLA_PUT_STRING for string dumping
  [NET_SCHED]: Use nla_nest_start/nla_nest_end
  [NET_SCHED]: Propagate nla_parse return value
  [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
  [NET_SCHED]: act_api: use nlmsg_parse
  [NET_SCHED]: act_api: fix netlink API conversion bug
  [NET_SCHED]: sch_netem: use nla_parse_nested_compat
  [NET_SCHED]: sch_atm: fix format string warning
  [NETNS]: Add namespace for ICMP replying code.
  ...

1 files changed, 31 insertions, 0 deletions

diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 89f0c2b5f405..86d3effb2836 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -217,4 +217,35 @@ enum
         __LINUX_MIB_MAX
 };
 
+/* linux Xfrm mib definitions */
+enum
+{
+        LINUX_MIB_XFRMNUM = 0,
+        LINUX_MIB_XFRMINERROR,                  /* XfrmInError */
+        LINUX_MIB_XFRMINBUFFERERROR,            /* XfrmInBufferError */
+        LINUX_MIB_XFRMINHDRERROR,               /* XfrmInHdrError */
+        LINUX_MIB_XFRMINNOSTATES,               /* XfrmInNoStates */
+        LINUX_MIB_XFRMINSTATEPROTOERROR,        /* XfrmInStateProtoError */
+        LINUX_MIB_XFRMINSTATEMODEERROR,         /* XfrmInStateModeError */
+        LINUX_MIB_XFRMINSEQOUTOFWINDOW,         /* XfrmInSeqOutOfWindow */
+        LINUX_MIB_XFRMINSTATEEXPIRED,           /* XfrmInStateExpired */
+        LINUX_MIB_XFRMINSTATEMISMATCH,          /* XfrmInStateMismatch */
+        LINUX_MIB_XFRMINSTATEINVALID,           /* XfrmInStateInvalid */
+        LINUX_MIB_XFRMINTMPLMISMATCH,           /* XfrmInTmplMismatch */
+        LINUX_MIB_XFRMINNOPOLS,                 /* XfrmInNoPols */
+        LINUX_MIB_XFRMINPOLBLOCK,               /* XfrmInPolBlock */
+        LINUX_MIB_XFRMINPOLERROR,               /* XfrmInPolError */
+        LINUX_MIB_XFRMOUTERROR,                 /* XfrmOutError */
+        LINUX_MIB_XFRMOUTBUNDLEGENERROR,        /* XfrmOutBundleGenError */
+        LINUX_MIB_XFRMOUTBUNDLECHECKERROR,      /* XfrmOutBundleCheckError */
+        LINUX_MIB_XFRMOUTNOSTATES,              /* XfrmOutNoStates */
+        LINUX_MIB_XFRMOUTSTATEPROTOERROR,       /* XfrmOutStateProtoError */
+        LINUX_MIB_XFRMOUTSTATEMODEERROR,        /* XfrmOutStateModeError */
+        LINUX_MIB_XFRMOUTSTATEEXPIRED,          /* XfrmOutStateExpired */
+        LINUX_MIB_XFRMOUTPOLBLOCK,              /* XfrmOutPolBlock */
+        LINUX_MIB_XFRMOUTPOLDEAD,               /* XfrmOutPolDead */
+        LINUX_MIB_XFRMOUTPOLERROR,              /* XfrmOutPolError */
+        __LINUX_MIB_XFRMMAX
+};
+
 #endif  /* _LINUX_SNMP_H */