svn commit: r347149 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun May  5 11:05:36 2019
New Revision: 347149
URL: https://svnweb.freebsd.org/changeset/base/347149

Log:
  MFC r333980:
  Do the appropriate accounting when ip_output() fails.
  Manually remove a merge conflict.

Modified:
  stable/11/sys/netinet/sctp_output.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_output.c
==============================================================================
--- stable/11/sys/netinet/sctp_output.c	Sun May  5 11:04:01 2019	(r347148)
+++ stable/11/sys/netinet/sctp_output.c	Sun May  5 11:05:36 2019	(r347149)
@@ -11055,9 +11055,8 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockad
 	struct sctp_chunkhdr *ch;
 #if defined(INET) || defined(INET6)
 	struct udphdr *udp;
-	int ret;
 #endif
-	int len, cause_len, padding_len;
+	int ret, len, cause_len, padding_len;
 #ifdef INET
 	struct sockaddr_in *src_sin, *dst_sin;
 	struct ip *ip;
@@ -11284,9 +11283,13 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockad
 		SCTP_LTRACE_ERR_RET_PKT(mout, NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EFAULT);
 		return;
 	}
+	SCTPDBG(SCTP_DEBUG_OUTPUT3, "return from send is %d\n", ret);
 	SCTP_STAT_INCR(sctps_sendpackets);
 	SCTP_STAT_INCR_COUNTER64(sctps_outpackets);
 	SCTP_STAT_INCR_COUNTER64(sctps_outcontrolchunks);
+	if (ret) {
+		SCTP_STAT_INCR(sctps_senderrors);
+	}
 	return;
 }