diff options
| author | Ben Murdoch <benm@google.com> | 2014-07-20 18:31:19 -0700 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-07-20 18:31:19 -0700 |
| commit | ed9a6fb519aa7606cab965b2c4218756e849ddb6 (patch) | |
| tree | e44213c06aa2801acffafafef538021815559979 /netinet/sctp_timer.c | |
| parent | 46100e9a86ac58447f99ee8ed55a9d7eb01d101a (diff) | |
| parent | 20d3b9ce7744465ea350696de9160a349cd52a05 (diff) | |
| download | usrsctplib-ed9a6fb519aa7606cab965b2c4218756e849ddb6.tar.gz | |
Merge from Chromium at DEPS revision 284076android-wear-5.1.1_r1android-wear-5.1.0_r1
This commit was generated by merge_to_master.py.
Change-Id: Id9832ab1559c6be7b68890be21e02a23214c7e5f
Diffstat (limited to 'netinet/sctp_timer.c')
| -rwxr-xr-x | netinet/sctp_timer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/netinet/sctp_timer.c b/netinet/sctp_timer.c index 0ad6de0..9627dc5 100755 --- a/netinet/sctp_timer.c +++ b/netinet/sctp_timer.c @@ -54,9 +54,11 @@ __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 263237 2014-03-16 12:32:16Z tu #include <netinet/sctp_input.h> #include <netinet/sctp.h> #include <netinet/sctp_uio.h> +#if defined INET || defined INET6 #if !defined(__Userspace_os_Windows) #include <netinet/udp.h> #endif +#endif #if defined(__APPLE__) #define APPLE_FILE_NO 6 @@ -1502,9 +1504,11 @@ sctp_pathmtu_timer(struct sctp_inpcb *inp, } if (net->ro._s_addr) { mtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr, &net->ro._s_addr.sa, net->ro.ro_rt); +#if defined INET || defined INET6 if (net->port) { mtu -= sizeof(struct udphdr); } +#endif if (mtu > next_mtu) { net->mtu = next_mtu; } |