diff options
Diffstat (limited to 'net/sctp/outqueue.c')
-rw-r--r-- | net/sctp/outqueue.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 8c6d379b4bb6..bf92a5b68f8b 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -177,13 +177,13 @@ static inline int sctp_cacc_skip_3_2(struct sctp_transport *primary, __u32 tsn) | |||
177 | * 3) If the missing report count for TSN t is to be | 177 | * 3) If the missing report count for TSN t is to be |
178 | * incremented according to [RFC2960] and | 178 | * incremented according to [RFC2960] and |
179 | * [SCTP_STEWART-2002], and CHANGEOVER_ACTIVE is set, | 179 | * [SCTP_STEWART-2002], and CHANGEOVER_ACTIVE is set, |
180 | * then the sender MUST futher execute steps 3.1 and | 180 | * then the sender MUST further execute steps 3.1 and |
181 | * 3.2 to determine if the missing report count for | 181 | * 3.2 to determine if the missing report count for |
182 | * TSN t SHOULD NOT be incremented. | 182 | * TSN t SHOULD NOT be incremented. |
183 | * | 183 | * |
184 | * 3.3) If 3.1 and 3.2 do not dictate that the missing | 184 | * 3.3) If 3.1 and 3.2 do not dictate that the missing |
185 | * report count for t should not be incremented, then | 185 | * report count for t should not be incremented, then |
186 | * the sender SOULD increment missing report count for | 186 | * the sender SHOULD increment missing report count for |
187 | * t (according to [RFC2960] and [SCTP_STEWART_2002]). | 187 | * t (according to [RFC2960] and [SCTP_STEWART_2002]). |
188 | */ | 188 | */ |
189 | static inline int sctp_cacc_skip(struct sctp_transport *primary, | 189 | static inline int sctp_cacc_skip(struct sctp_transport *primary, |
@@ -545,13 +545,11 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt, | |||
545 | struct sctp_transport *transport = pkt->transport; | 545 | struct sctp_transport *transport = pkt->transport; |
546 | sctp_xmit_t status; | 546 | sctp_xmit_t status; |
547 | struct sctp_chunk *chunk, *chunk1; | 547 | struct sctp_chunk *chunk, *chunk1; |
548 | struct sctp_association *asoc; | ||
549 | int fast_rtx; | 548 | int fast_rtx; |
550 | int error = 0; | 549 | int error = 0; |
551 | int timer = 0; | 550 | int timer = 0; |
552 | int done = 0; | 551 | int done = 0; |
553 | 552 | ||
554 | asoc = q->asoc; | ||
555 | lqueue = &q->retransmit; | 553 | lqueue = &q->retransmit; |
556 | fast_rtx = q->fast_rtx; | 554 | fast_rtx = q->fast_rtx; |
557 | 555 | ||
@@ -845,7 +843,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) | |||
845 | case SCTP_CID_ECN_CWR: | 843 | case SCTP_CID_ECN_CWR: |
846 | case SCTP_CID_ASCONF_ACK: | 844 | case SCTP_CID_ASCONF_ACK: |
847 | one_packet = 1; | 845 | one_packet = 1; |
848 | /* Fall throught */ | 846 | /* Fall through */ |
849 | 847 | ||
850 | case SCTP_CID_SACK: | 848 | case SCTP_CID_SACK: |
851 | case SCTP_CID_HEARTBEAT: | 849 | case SCTP_CID_HEARTBEAT: |