diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-21 03:34:10 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-21 03:34:10 +0000 |
| commit | f8d762fe0109f3bc0410611ba38d8ea669bd9d0d (patch) | |
| tree | 66a625e0c9aa9ffa9f3552985e6b03463e2ebc08 | |
| parent | 85eae12ae0fc2a588c5d128b1b9965898d4bcee9 (diff) | |
| parent | b98cd1625370bb211c627b7fb240bc642b505bbe (diff) | |
| download | usrsctplib-f8d762fe0109f3bc0410611ba38d8ea669bd9d0d.tar.gz | |
Merge third_party/usrsctp/usrsctplib from https://chromium.googlesource.com/external/usrsctplib.git at b98cd1625370bb211c627b7fb240bc642b505bbe
This commit was generated by merge_from_chromium.py.
Change-Id: I06e7bdec1b604c6c9c543f3f8ee001555e45d676
| -rwxr-xr-x | netinet/sctp_output.c | 5 | ||||
| -rwxr-xr-x | user_ip_icmp.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/netinet/sctp_output.c b/netinet/sctp_output.c index 46ca9d7..72f6bc3 100755 --- a/netinet/sctp_output.c +++ b/netinet/sctp_output.c @@ -32,7 +32,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 263237 2014-03-16 12:32:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 264017 2014-04-01 18:38:04Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -7745,7 +7745,8 @@ re_look: chk->pad_inplace = 0; chk->no_fr_allowed = 0; chk->rec.data.stream_seq = strq->next_sequence_send; - if (rcv_flags & SCTP_DATA_LAST_FRAG) { + if ((rcv_flags & SCTP_DATA_LAST_FRAG) && + !(rcv_flags & SCTP_DATA_UNORDERED)) { strq->next_sequence_send++; } chk->rec.data.stream_number = sp->stream; diff --git a/user_ip_icmp.h b/user_ip_icmp.h index 4cd243f..e713417 100755 --- a/user_ip_icmp.h +++ b/user_ip_icmp.h @@ -54,6 +54,7 @@ struct icmphdr { }; #if defined(__Userspace_os_Windows) +#pragma pack (push, 1) struct icmp6_hdr { u_int8_t icmp6_type; u_int8_t icmp6_code; @@ -63,7 +64,8 @@ struct icmp6_hdr { u_int16_t icmp6_un_data16[2]; u_int8_t icmp6_un_data8[4]; } icmp6_dataun; -} __packed; +}; +#pragma pack() #define icmp6_data32 icmp6_dataun.icmp6_un_data32 #define icmp6_mtu icmp6_data32[0] |