From: David S. Miller <davem@davemloft.net>
Date: Mon, 3 Oct 2016 01:17:07 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.9-rc1~127^2~27
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=b50afd203a5ef1998c18d6519ad2b2c546d6af22

Merge git://git./linux/kernel/git/davem/net

Three sets of overlapping changes.  Nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

b50afd203a5ef1998c18d6519ad2b2c546d6af22
diff --cc net/sctp/outqueue.c
index 3ec6da8bbb53,107233da5cc9..582585393d35
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@@ -298,19 -299,42 +298,19 @@@ void sctp_outq_tail(struct sctp_outq *q
  	 * immediately.
  	 */
  	if (sctp_chunk_is_data(chunk)) {
 -		/* Is it OK to queue data chunks?  */
 -		/* From 9. Termination of Association
 -		 *
 -		 * When either endpoint performs a shutdown, the
 -		 * association on each peer will stop accepting new
 -		 * data from its user and only deliver data in queue
 -		 * at the time of sending or receiving the SHUTDOWN
 -		 * chunk.
 -		 */
 -		switch (q->asoc->state) {
 -		case SCTP_STATE_CLOSED:
 -		case SCTP_STATE_SHUTDOWN_PENDING:
 -		case SCTP_STATE_SHUTDOWN_SENT:
 -		case SCTP_STATE_SHUTDOWN_RECEIVED:
 -		case SCTP_STATE_SHUTDOWN_ACK_SENT:
 -			/* Cannot send after transport endpoint shutdown */
 -			error = -ESHUTDOWN;
 -			break;
 -
 -		default:
 -			pr_debug("%s: outqueueing: outq:%p, chunk:%p[%s])\n",
 -				 __func__, q, chunk, chunk && chunk->chunk_hdr ?
 -				 sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) :
 -				 "illegal chunk");
 -
 -			sctp_chunk_hold(chunk);
 -			sctp_outq_tail_data(q, chunk);
 -			if (chunk->asoc->peer.prsctp_capable &&
 -			    SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags))
 -				chunk->asoc->sent_cnt_removable++;
 -			if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED)
 -				SCTP_INC_STATS(net, SCTP_MIB_OUTUNORDERCHUNKS);
 -			else
 -				SCTP_INC_STATS(net, SCTP_MIB_OUTORDERCHUNKS);
 -			break;
 -		}
 +		pr_debug("%s: outqueueing: outq:%p, chunk:%p[%s])\n",
 +			 __func__, q, chunk, chunk && chunk->chunk_hdr ?
 +			 sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) :
 +			 "illegal chunk");
 +
 +		sctp_outq_tail_data(q, chunk);
- 		if (chunk->asoc->prsctp_enable &&
++		if (chunk->asoc->peer.prsctp_capable &&
 +		    SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags))
 +			chunk->asoc->sent_cnt_removable++;
 +		if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED)
 +			SCTP_INC_STATS(net, SCTP_MIB_OUTUNORDERCHUNKS);
 +		else
 +			SCTP_INC_STATS(net, SCTP_MIB_OUTORDERCHUNKS);
  	} else {
  		list_add_tail(&chunk->list, &q->control_chunk_list);
  		SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS);
diff --cc net/sctp/sctp_diag.c
index 807158e32f5f,cef0cee182d4..048954eee984
--- a/net/sctp/sctp_diag.c
+++ b/net/sctp/sctp_diag.c
@@@ -314,10 -299,9 +303,10 @@@ static int sctp_sock_dump(struct sock *
  					sk_user_ns(NETLINK_CB(cb->skb).sk),
  					NETLINK_CB(cb->skb).portid,
  					cb->nlh->nlmsg_seq,
 -					NLM_F_MULTI, cb->nlh) < 0) {
 +					NLM_F_MULTI, cb->nlh,
 +					commp->net_admin) < 0) {
  			cb->args[3] = 1;
- 			err = 2;
+ 			err = 1;
  			goto release;
  		}
  		cb->args[3] = 1;
@@@ -325,9 -309,8 +314,9 @@@
  		if (inet_sctp_diag_fill(sk, assoc, skb, r,
  					sk_user_ns(NETLINK_CB(cb->skb).sk),
  					NETLINK_CB(cb->skb).portid,
 -					cb->nlh->nlmsg_seq, 0, cb->nlh) < 0) {
 +					cb->nlh->nlmsg_seq, 0, cb->nlh,
 +					commp->net_admin) < 0) {
- 			err = 2;
+ 			err = 1;
  			goto release;
  		}
  next: