Merge Linux 2.6.23

1 files changed, 6 insertions, 2 deletions

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index d9fad4f6ffc3..8d7890083493 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1013,8 +1013,9 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                 break;
 
         case SCTP_DISPOSITION_VIOLATION:
-                printk(KERN_ERR "sctp protocol violation state %d "
-                       "chunkid %d\n", state, subtype.chunk);
+                if (net_ratelimit())
+                        printk(KERN_ERR "sctp protocol violation state %d "
+                               "chunkid %d\n", state, subtype.chunk);
                 break;
 
         case SCTP_DISPOSITION_NOT_IMPL:
@@ -1130,6 +1131,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                         /* Move the Cumulattive TSN Ack ahead. */
                         sctp_tsnmap_skip(&asoc->peer.tsn_map, cmd->obj.u32);
 
+                        /* purge the fragmentation queue */
+                        sctp_ulpq_reasm_flushtsn(&asoc->ulpq, cmd->obj.u32);
+
                         /* Abort any in progress partial delivery. */
                         sctp_ulpq_abort_pd(&asoc->ulpq, GFP_ATOMIC);
                         break;