| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From db6d15bf12a0123e4320e5fd7cb688331dea1bdc Mon Sep 17 00:00:00 2001 |
| 2 | From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> |
| 3 | Date: Fri, 24 Aug 2018 09:52:58 -0300 |
| 4 | Subject: [PATCH] build: remove v4.12 secondary defines in favor of |
| 5 | HAVE_SCTP_STREAM_RECONFIG |
| 6 | |
| 7 | These were backups, commented out since beginning. |
| 8 | HAVE_SCTP_STREAM_RECONFIG is enough to identify that these are there, so |
| 9 | lets use only one. |
| 10 | |
| 11 | Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> |
| 12 | Reviewed-by: Xin Long <lucien.xin@gmail.com> |
| 13 | --- |
| 14 | configure.ac | 8 -------- |
| 15 | src/include/netinet/sctp.h.in | 2 -- |
| 16 | 2 files changed, 10 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.ac b/configure.ac |
| 19 | index 2ae36ec..dad658c 100644 |
| 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
| 22 | @@ -82,14 +82,6 @@ AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket \ |
| 23 | LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_reset_event], |
| 24 | [HAVE_SCTP_STREAM_RESET_EVENT]) |
| 25 | |
| 26 | -# Support for assoc reset event, added on v4.12, c95129d127c6 |
| 27 | -#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_assoc_reset_event], \ |
| 28 | -# [HAVE_SCTP_ASSOC_RESET_EVENT]) |
| 29 | - |
| 30 | -# Support for stream change event, added on v4.12, b444153fb5a6 |
| 31 | -#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_change_event], \ |
| 32 | -# [HAVE_SCTP_STREAM_CHANGE_EVENT]) |
| 33 | - |
| 34 | # RFC 6525 (Stream Reconf), finished on v4.12, c0d8bab6ae51 |
| 35 | LKSCTP_CHECK_DECL([SCTP_RECONFIG_SUPPORTED], [HAVE_SCTP_STREAM_RECONFIG]) |
| 36 | |
| 37 | diff --git a/src/include/netinet/sctp.h.in b/src/include/netinet/sctp.h.in |
| 38 | index c049077..2009f1c 100644 |
| 39 | --- a/src/include/netinet/sctp.h.in |
| 40 | +++ b/src/include/netinet/sctp.h.in |
| 41 | @@ -61,8 +61,6 @@ extern "C" { |
| 42 | #define HAVE_SCTP_CANSET_PRIMARY |
| 43 | |
| 44 | #undef HAVE_SCTP_STREAM_RESET_EVENT |
| 45 | -#undef HAVE_SCTP_ASSOC_RESET_EVENT |
| 46 | -#undef HAVE_SCTP_STREAM_CHANGE_EVENT |
| 47 | #undef HAVE_SCTP_STREAM_RECONFIG |
| 48 | #undef HAVE_SCTP_PEELOFF_FLAGS |
| 49 | #undef HAVE_SCTP_PDAPI_EVENT_PDAPI_STREAM |
| 50 | -- |
| 51 | 2.7.4 |
| 52 | |