git: 25152e8f1a37 - stable/13 - Revert "sctp: improve consistency"

The branch stable/13 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=25152e8f1a37fbb785bfc56a83a68860fe75f8ea

commit 25152e8f1a37fbb785bfc56a83a68860fe75f8ea
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-08-01 20:19:05 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-08-01 20:19:05 +0000

    Revert "sctp: improve consistency"
    
    This reverts commit bf28627b71c6feae3f3fdf614c7b65d71d682bac.
---
 sys/netinet/sctp_output.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index ab97d9b13e5d..7626e4ec066c 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -5019,20 +5019,11 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt,
 			at += padded_size;
 			break;
 		case SCTP_HAS_NAT_SUPPORT:
-			if (padded_size != sizeof(struct sctp_paramhdr)) {
-				SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error nat support %d\n", plen);
-				goto invalid_size;
-			}
 			*nat_friendly = 1;
-<<<<<<< HEAD
 			/* fall through */
-=======
-			at += padded_size;
-			break;
->>>>>>> 533faf21c19d (sctp: improve consistency)
 		case SCTP_PRSCTP_SUPPORTED:
 			if (padded_size != sizeof(struct sctp_paramhdr)) {
-				SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp %d\n", plen);
+				SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp/nat support %d\n", plen);
 				goto invalid_size;
 			}
 			at += padded_size;