Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 14 insertions, 1 deletions

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index acf7c4d128f7..8e4320040f05 100644
--- a/net/sctp/chunk.c
+++ b/net/sctp/chunk.c
@@ -263,9 +263,18 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
                 if (0 == i)
                         frag |= SCTP_DATA_FIRST_FRAG;
 
-                if ((i == (whole - 1)) && !over)
+                if ((i == (whole - 1)) && !over) {
                         frag |= SCTP_DATA_LAST_FRAG;
 
+                        /* The application requests to set the I-bit of the
+                         * last DATA chunk of a user message when providing
+                         * the user message to the SCTP implementation.
+                         */
+                        if ((sinfo->sinfo_flags & SCTP_EOF) ||
+                            (sinfo->sinfo_flags & SCTP_SACK_IMMEDIATELY))
+                                frag |= SCTP_DATA_SACK_IMM;
+                }
+
                 chunk = sctp_make_datafrag_empty(asoc, sinfo, len, frag, 0);
 
                 if (!chunk)
@@ -297,6 +306,10 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
                 else
                         frag = SCTP_DATA_LAST_FRAG;
 
+                if ((sinfo->sinfo_flags & SCTP_EOF) ||
+                    (sinfo->sinfo_flags & SCTP_SACK_IMMEDIATELY))
+                        frag |= SCTP_DATA_SACK_IMM;
+
                 chunk = sctp_make_datafrag_empty(asoc, sinfo, over, frag, 0);
 
                 if (!chunk)