diff options
| author | t00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2013-09-07 00:49:17 +0000 |
|---|---|---|
| committer | t00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2013-09-07 00:49:17 +0000 |
| commit | cdc78af866f2b29865707afee7ea65e1706b4ff8 (patch) | |
| tree | c98dfc2b04da95ae2640c75476bfc79f77fa6678 /netinet/sctp_indata.c | |
| parent | d4335879f279360ad6f8d03b9b93908d7b32f058 (diff) | |
| download | usrsctplib-cdc78af866f2b29865707afee7ea65e1706b4ff8.tar.gz | |
Sync FBSDID and with Mountain Lion sources.
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8607 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
Diffstat (limited to 'netinet/sctp_indata.c')
| -rwxr-xr-x | netinet/sctp_indata.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/netinet/sctp_indata.c b/netinet/sctp_indata.c index 15c8da2..041ca18 100755 --- a/netinet/sctp_indata.c +++ b/netinet/sctp_indata.c @@ -32,7 +32,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 255190 2013-09-03 19:31:59Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 255337 2013-09-07 00:45:24Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -806,13 +806,12 @@ sctp_deliver_reasm_check(struct sctp_tcb *stcb, struct sctp_association *asoc) * but should we? */ if (stcb->sctp_socket) { - pd_point = min(SCTP_SB_LIMIT_RCV(stcb->sctp_socket), + pd_point = min(SCTP_SB_LIMIT_RCV(stcb->sctp_socket) >> SCTP_PARTIAL_DELIVERY_SHIFT, stcb->sctp_ep->partial_delivery_point); } else { pd_point = stcb->sctp_ep->partial_delivery_point; } if (sctp_is_all_msg_on_reasm(asoc, &tsize) || (tsize >= pd_point)) { - /* * Yes, we setup to start reception, by * backing down the TSN just in case we @@ -2503,7 +2502,7 @@ sctp_service_queues(struct sctp_tcb *stcb, struct sctp_association *asoc) * delivery queue and something can be delivered. */ if (stcb->sctp_socket) { - pd_point = min(SCTP_SB_LIMIT_RCV(stcb->sctp_socket), + pd_point = min(SCTP_SB_LIMIT_RCV(stcb->sctp_socket) >> SCTP_PARTIAL_DELIVERY_SHIFT, stcb->sctp_ep->partial_delivery_point); } else { pd_point = stcb->sctp_ep->partial_delivery_point; |