|
 |
9c2663 |
From db6d15bf12a0123e4320e5fd7cb688331dea1bdc Mon Sep 17 00:00:00 2001
|
|
|
9c2663 |
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
|
|
|
9c2663 |
Date: Fri, 24 Aug 2018 09:52:58 -0300
|
|
|
9c2663 |
Subject: [PATCH 1/3] build: remove v4.12 secondary defines in favor of
|
|
|
9c2663 |
HAVE_SCTP_STREAM_RECONFIG
|
|
|
9c2663 |
|
|
|
9c2663 |
These were backups, commented out since beginning.
|
|
|
9c2663 |
HAVE_SCTP_STREAM_RECONFIG is enough to identify that these are there, so
|
|
|
9c2663 |
lets use only one.
|
|
|
9c2663 |
|
|
|
9c2663 |
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
|
|
|
9c2663 |
Reviewed-by: Xin Long <lucien.xin@gmail.com>
|
|
|
9c2663 |
---
|
|
|
9c2663 |
configure.ac | 8 --------
|
|
|
9c2663 |
src/include/netinet/sctp.h.in | 2 --
|
|
|
9c2663 |
2 files changed, 10 deletions(-)
|
|
|
9c2663 |
|
|
|
9c2663 |
diff --git a/configure.ac b/configure.ac
|
|
|
9c2663 |
index 2ae36ec..dad658c 100644
|
|
|
9c2663 |
--- a/configure.ac
|
|
|
9c2663 |
+++ b/configure.ac
|
|
|
9c2663 |
@@ -82,14 +82,6 @@ AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket \
|
|
|
9c2663 |
LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_reset_event],
|
|
|
9c2663 |
[HAVE_SCTP_STREAM_RESET_EVENT])
|
|
|
9c2663 |
|
|
|
9c2663 |
-# Support for assoc reset event, added on v4.12, c95129d127c6
|
|
|
9c2663 |
-#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_assoc_reset_event], \
|
|
|
9c2663 |
-# [HAVE_SCTP_ASSOC_RESET_EVENT])
|
|
|
9c2663 |
-
|
|
|
9c2663 |
-# Support for stream change event, added on v4.12, b444153fb5a6
|
|
|
9c2663 |
-#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_change_event], \
|
|
|
9c2663 |
-# [HAVE_SCTP_STREAM_CHANGE_EVENT])
|
|
|
9c2663 |
-
|
|
|
9c2663 |
# RFC 6525 (Stream Reconf), finished on v4.12, c0d8bab6ae51
|
|
|
9c2663 |
LKSCTP_CHECK_DECL([SCTP_RECONFIG_SUPPORTED], [HAVE_SCTP_STREAM_RECONFIG])
|
|
|
9c2663 |
|
|
|
9c2663 |
diff --git a/src/include/netinet/sctp.h.in b/src/include/netinet/sctp.h.in
|
|
|
9c2663 |
index c049077..2009f1c 100644
|
|
|
9c2663 |
--- a/src/include/netinet/sctp.h.in
|
|
|
9c2663 |
+++ b/src/include/netinet/sctp.h.in
|
|
|
9c2663 |
@@ -61,8 +61,6 @@ extern "C" {
|
|
|
9c2663 |
#define HAVE_SCTP_CANSET_PRIMARY
|
|
|
9c2663 |
|
|
|
9c2663 |
#undef HAVE_SCTP_STREAM_RESET_EVENT
|
|
|
9c2663 |
-#undef HAVE_SCTP_ASSOC_RESET_EVENT
|
|
|
9c2663 |
-#undef HAVE_SCTP_STREAM_CHANGE_EVENT
|
|
|
9c2663 |
#undef HAVE_SCTP_STREAM_RECONFIG
|
|
|
9c2663 |
#undef HAVE_SCTP_PEELOFF_FLAGS
|
|
|
9c2663 |
#undef HAVE_SCTP_PDAPI_EVENT_PDAPI_STREAM
|
|
|
9c2663 |
--
|
|
|
9c2663 |
1.8.3.1
|
|
|
9c2663 |
|