5 files changed, 13 insertions, 6 deletions

diff --git a/Documentation/networking/xfrm_proc.txt b/Documentation/networking/xfrm_proc.txt
index 53c1a58b02f1..d0d8bafa9016 100644
--- a/Documentation/networking/xfrm_proc.txt
+++ b/Documentation/networking/xfrm_proc.txt
@@ -26,8 +26,9 @@ XfrmInStateProtoError:
         e.g. SA key is wrong
 XfrmInStateModeError:
         Transformation mode specific error
-XfrmInSeqOutOfWindow:
-        Sequence out of window
+XfrmInStateSeqError:
+        Sequence error
+        i.e. Sequence number is out of window
 XfrmInStateExpired:
         State is expired
 XfrmInStateMismatch:
@@ -60,6 +61,9 @@ XfrmOutStateProtoError:
         Transformation protocol specific error
 XfrmOutStateModeError:
         Transformation mode specific error
+XfrmOutStateSeqError:
+        Sequence error
+        i.e. Sequence number overflow
 XfrmOutStateExpired:
         State is expired
 XfrmOutPolBlock:
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 86d3effb2836..5df62ef1280c 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -227,7 +227,7 @@ enum
         LINUX_MIB_XFRMINNOSTATES,               /* XfrmInNoStates */
         LINUX_MIB_XFRMINSTATEPROTOERROR,        /* XfrmInStateProtoError */
         LINUX_MIB_XFRMINSTATEMODEERROR,         /* XfrmInStateModeError */
-        LINUX_MIB_XFRMINSEQOUTOFWINDOW,         /* XfrmInSeqOutOfWindow */
+        LINUX_MIB_XFRMINSTATESEQERROR,          /* XfrmInStateSeqError */
         LINUX_MIB_XFRMINSTATEEXPIRED,           /* XfrmInStateExpired */
         LINUX_MIB_XFRMINSTATEMISMATCH,          /* XfrmInStateMismatch */
         LINUX_MIB_XFRMINSTATEINVALID,           /* XfrmInStateInvalid */
@@ -241,6 +241,7 @@ enum
         LINUX_MIB_XFRMOUTNOSTATES,              /* XfrmOutNoStates */
         LINUX_MIB_XFRMOUTSTATEPROTOERROR,       /* XfrmOutStateProtoError */
         LINUX_MIB_XFRMOUTSTATEMODEERROR,        /* XfrmOutStateModeError */
+        LINUX_MIB_XFRMOUTSTATESEQERROR,         /* XfrmOutStateSeqError */
         LINUX_MIB_XFRMOUTSTATEEXPIRED,          /* XfrmOutStateExpired */
         LINUX_MIB_XFRMOUTPOLBLOCK,              /* XfrmOutPolBlock */
         LINUX_MIB_XFRMOUTPOLDEAD,               /* XfrmOutPolDead */
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index d32b67a4e0fd..4d6ebc633a94 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -159,12 +159,12 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
                 }
 
                 if ((x->encap ? x->encap->encap_type : 0) != encap_type) {
-                        XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEINVALID);
+                        XFRM_INC_STATS(LINUX_MIB_XFRMINSTATEMISMATCH);
                         goto drop_unlock;
                 }
 
                 if (x->props.replay_window && xfrm_replay_check(x, skb, seq)) {
-                        XFRM_INC_STATS(LINUX_MIB_XFRMINSEQOUTOFWINDOW);
+                        XFRM_INC_STATS(LINUX_MIB_XFRMINSTATESEQERROR);
                         goto drop_unlock;
                 }
 
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index f4a1047a5573..fc690368325f 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -64,6 +64,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
                 if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
                         XFRM_SKB_CB(skb)->seq = ++x->replay.oseq;
                         if (unlikely(x->replay.oseq == 0)) {
+                                XFRM_INC_STATS(LINUX_MIB_XFRMOUTSTATESEQERROR);
                                 x->replay.oseq--;
                                 xfrm_audit_state_replay_overflow(x, skb);
                                 err = -EOVERFLOW;
diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c
index 31d035415ecd..2b0db13f0cda 100644
--- a/net/xfrm/xfrm_proc.c
+++ b/net/xfrm/xfrm_proc.c
@@ -22,7 +22,7 @@ static struct snmp_mib xfrm_mib_list[] = {
         SNMP_MIB_ITEM("XfrmInNoStates", LINUX_MIB_XFRMINNOSTATES),
         SNMP_MIB_ITEM("XfrmInStateProtoError", LINUX_MIB_XFRMINSTATEPROTOERROR),
         SNMP_MIB_ITEM("XfrmInStateModeError", LINUX_MIB_XFRMINSTATEMODEERROR),
-        SNMP_MIB_ITEM("XfrmInSeqOutOfWindow", LINUX_MIB_XFRMINSEQOUTOFWINDOW),
+        SNMP_MIB_ITEM("XfrmInStateSeqError", LINUX_MIB_XFRMINSTATESEQERROR),
         SNMP_MIB_ITEM("XfrmInStateExpired", LINUX_MIB_XFRMINSTATEEXPIRED),
         SNMP_MIB_ITEM("XfrmInStateMismatch", LINUX_MIB_XFRMINSTATEMISMATCH),
         SNMP_MIB_ITEM("XfrmInStateInvalid", LINUX_MIB_XFRMINSTATEINVALID),
@@ -36,6 +36,7 @@ static struct snmp_mib xfrm_mib_list[] = {
         SNMP_MIB_ITEM("XfrmOutNoStates", LINUX_MIB_XFRMOUTNOSTATES),
         SNMP_MIB_ITEM("XfrmOutStateProtoError", LINUX_MIB_XFRMOUTSTATEPROTOERROR),
         SNMP_MIB_ITEM("XfrmOutStateModeError", LINUX_MIB_XFRMOUTSTATEMODEERROR),
+        SNMP_MIB_ITEM("XfrmOutStateSeqError", LINUX_MIB_XFRMOUTSTATESEQERROR),
         SNMP_MIB_ITEM("XfrmOutStateExpired", LINUX_MIB_XFRMOUTSTATEEXPIRED),
         SNMP_MIB_ITEM("XfrmOutPolBlock", LINUX_MIB_XFRMOUTPOLBLOCK),
         SNMP_MIB_ITEM("XfrmOutPolDead", LINUX_MIB_XFRMOUTPOLDEAD),