diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 00:37:03 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 00:38:16 -0500 |
| commit | fe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch) | |
| tree | 8dd536be0e16e86109295142edd1ef1fd18c2e98 /net/sctp/output.c | |
| parent | 4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (diff) | |
| parent | 413541dd66d51f791a0b169d9b9014e4f56be13c (diff) | |
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.
Linux 3.13-rc5
Diffstat (limited to 'net/sctp/output.c')
| -rw-r--r-- | net/sctp/output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 0e2644d0a773..0fb140f8f088 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -581,7 +581,8 @@ int sctp_packet_transmit(struct sctp_packet *packet) | |||
| 581 | unsigned long timeout; | 581 | unsigned long timeout; |
| 582 | 582 | ||
| 583 | /* Restart the AUTOCLOSE timer when sending data. */ | 583 | /* Restart the AUTOCLOSE timer when sending data. */ |
| 584 | if (sctp_state(asoc, ESTABLISHED) && asoc->autoclose) { | 584 | if (sctp_state(asoc, ESTABLISHED) && |
| 585 | asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]) { | ||
| 585 | timer = &asoc->timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; | 586 | timer = &asoc->timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; |
| 586 | timeout = asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; | 587 | timeout = asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; |
| 587 | 588 | ||