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

[Michael Tuexen]

Author: tuexen
Date: Sun May  5 10:57:27 2019
New Revision: 347147
URL: https://svnweb.freebsd.org/changeset/base/347147

Log:
  MFC r333979:
  Make clear why there is an assignment, which is not necessary.
  To resolve the merge conflict, this also contains the changes
  from r333869.

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

Modified: stable/11/sys/netinet/sctp_indata.c
==============================================================================
--- stable/11/sys/netinet/sctp_indata.c	Sun May  5 10:42:32 2019	(r347146)
+++ stable/11/sys/netinet/sctp_indata.c	Sun May  5 10:57:27 2019	(r347147)
@@ -1669,9 +1669,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
     struct sctp_nets *net, uint32_t *high_tsn, int *abort_flag,
     int *break_flag, int last_chunk, uint8_t chk_type)
 {
-	/* Process a data chunk */
-	/* struct sctp_tmit_chunk *chk; */
-	struct sctp_tmit_chunk *chk;
+	struct sctp_tmit_chunk *chk = NULL;	/* make gcc happy */
 	uint32_t tsn, fsn, gap, mid;
 	struct mbuf *dmbuf;
 	int the_len;