Merge tag 'platform-drivers-x86-v4.4-2' of git://git.infradead.org/users/dvhart/linux...

[deliverable/linux.git] / net / sctp / outqueue.c

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 9c77947c0597c1c2f646214584a8480e038105e9..7e8f0a117106cabbf043e24e33f56b307cf4fc88 100644 (file)
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -629,7 +629,7 @@ redo:
                        done = 1;
                        break;
 
-               case SCTP_XMIT_NAGLE_DELAY:
+               case SCTP_XMIT_DELAY:
                        /* Send this packet. */
                        error = sctp_packet_transmit(pkt);
 
@@ -1015,7 +1015,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
                        switch (status) {
                        case SCTP_XMIT_PMTU_FULL:
                        case SCTP_XMIT_RWND_FULL:
-                       case SCTP_XMIT_NAGLE_DELAY:
+                       case SCTP_XMIT_DELAY:
                                /* We could not append this chunk, so put
                                 * the chunk back on the output queue.
                                 */
@@ -1025,7 +1025,6 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
 
                                sctp_outq_head_data(q, chunk);
                                goto sctp_flush_out;
-                               break;
 
                        case SCTP_XMIT_OK:
                                /* The sender is in the SHUTDOWN-PENDING state,