diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-27 12:09:29 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-27 12:09:29 +0000 |
| commit | c30fcd2221c0858859b3f99befbb671d12b09322 (patch) | |
| tree | 1583240a78fae486df285a9c0b3a051c38299e70 | |
| parent | 68a9663223179f447e99b76c6397037f880482e5 (diff) | |
| parent | 190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14 (diff) | |
| download | usrsctplib-c30fcd2221c0858859b3f99befbb671d12b09322.tar.gz | |
Merge third_party/usrsctp/usrsctplib from https://chromium.googlesource.com/external/usrsctplib.git at 190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14
This commit was generated by merge_from_chromium.py.
Change-Id: Ic62703bfc8911760e7a7417cbde0a93d29945582
| -rwxr-xr-x | netinet/sctp_output.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/netinet/sctp_output.c b/netinet/sctp_output.c index 07ae932..57cc8c6 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 272841 2014-10-09 20:08:12Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 273634 2014-10-25 09:25:29Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -7165,9 +7165,10 @@ sctp_sendall_iterator(struct sctp_inpcb *inp, struct sctp_tcb *stcb, void *ptr, if (do_chunk_output) sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_USR_SEND, SCTP_SO_NOT_LOCKED); else if (added_control) { - int num_out = 0, reason = 0, now_filled = 0; + int num_out, reason, now_filled = 0; struct timeval now; int frag_point; + frag_point = sctp_get_frag_point(stcb, &stcb->asoc); (void)sctp_med_chunk_output(inp, stcb, &stcb->asoc, &num_out, &reason, 1, 1, &now, &now_filled, frag_point, SCTP_SO_NOT_LOCKED); @@ -8247,6 +8248,7 @@ sctp_med_chunk_output(struct sctp_inpcb *inp, } #endif *num_out = 0; + *reason_code = 0; auth_keyid = stcb->asoc.authinfo.active_keyid; if ((asoc->state & SCTP_STATE_SHUTDOWN_PENDING) || (asoc->state & SCTP_STATE_SHUTDOWN_RECEIVED) || @@ -10405,7 +10407,7 @@ sctp_chunk_output (struct sctp_inpcb *inp, */ struct sctp_association *asoc; struct sctp_nets *net; - int error = 0, num_out = 0, tot_out = 0, ret = 0, reason_code = 0; + int error = 0, num_out, tot_out = 0, ret = 0, reason_code; unsigned int burst_cnt = 0; struct timeval now; int now_filled = 0; |