2 files changed, 10 insertions, 0 deletions

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 456b52d8f6d8..d1ab3a236cca 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -428,6 +428,7 @@ start:
                                session->name, L2TP_SKB_CB(skb)->ns,
                                L2TP_SKB_CB(skb)->length, session->nr,
                                skb_queue_len(&session->reorder_q));
+                        session->reorder_skip = 1;
                         __skb_unlink(skb, &session->reorder_q);
                         kfree_skb(skb);
                         if (session->deref)
@@ -436,6 +437,14 @@ start:
                 }
 
                 if (L2TP_SKB_CB(skb)->has_seq) {
+                        if (session->reorder_skip) {
+                                PRINTK(session->debug, L2TP_MSG_SEQ, KERN_DEBUG,
+                                       "%s: advancing nr to next pkt: %u -> %u",
+                                       session->name, session->nr,
+                                       L2TP_SKB_CB(skb)->ns);
+                                session->reorder_skip = 0;
+                                session->nr = L2TP_SKB_CB(skb)->ns;
+                        }
                         if (L2TP_SKB_CB(skb)->ns != session->nr) {
                                 PRINTK(session->debug, L2TP_MSG_SEQ, KERN_DEBUG,
                                        "%s: holding oos pkt %u len %d, "
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index 0bf60fc88bb7..90026341a1e5 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -123,6 +123,7 @@ struct l2tp_session {
                                                  * categories */
         int                     reorder_timeout; /* configured reorder timeout
                                                   * (in jiffies) */
+        int                     reorder_skip;   /* set if skip to next nr */
         int                     mtu;
         int                     mru;
         enum l2tp_pwtype        pwtype;