sctp: define SCTP_SS_DEFAULT for Stream schedulers

lxin · davem330 · commit 12480e3b1698 · 2018-11-03T19:40:29.000-07:00
According to rfc8260#section-4.3.2, SCTP_SS_DEFAULT is required to defined as SCTP_SS_FCFS or SCTP_SS_RR. SCTP_SS_FCFS is used for SCTP_SS_DEFAULT's value in this patch. Fixes: 5bbbbe3 ("sctp: introduce stream scheduler foundations") Reported-by: Jianwen Ji <jiji@redhat.com> Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
@@ -1153,6 +1153,7 @@ struct sctp_add_streams {
 /* SCTP Stream schedulers */
 enum sctp_sched_type {
 	SCTP_SS_FCFS,
+	SCTP_SS_DEFAULT = SCTP_SS_FCFS,
 	SCTP_SS_PRIO,
 	SCTP_SS_RR,
 	SCTP_SS_MAX = SCTP_SS_RR
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
@@ -212,7 +212,7 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)
 	INIT_LIST_HEAD(&q->retransmit);
 	INIT_LIST_HEAD(&q->sacked);
 	INIT_LIST_HEAD(&q->abandoned);
-	sctp_sched_set_sched(asoc, SCTP_SS_FCFS);
+	sctp_sched_set_sched(asoc, SCTP_SS_DEFAULT);
 }
 
 /* Free the outqueue structure and any related pending chunks.

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ void sctp_outq_init(struct sctp_association asoc, struct sctp_outq q)`
`212`	`212`	`INIT_LIST_HEAD(&q->retransmit);`
`213`	`213`	`INIT_LIST_HEAD(&q->sacked);`
`214`	`214`	`INIT_LIST_HEAD(&q->abandoned);`
`215`		`- sctp_sched_set_sched(asoc, SCTP_SS_FCFS);`
	`215`	`+ sctp_sched_set_sched(asoc, SCTP_SS_DEFAULT);`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`/* Free the outqueue structure and any related pending chunks.`