diff options
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/associola.c | 3 | ||||
-rw-r--r-- | net/sctp/transport.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index ee13d28d39d1..4f6d6f9d1274 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -1319,8 +1319,7 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc) | |||
1319 | break; | 1319 | break; |
1320 | } | 1320 | } |
1321 | 1321 | ||
1322 | if (trans_next != NULL) | 1322 | asoc->peer.retran_path = trans_next; |
1323 | asoc->peer.retran_path = trans_next; | ||
1324 | 1323 | ||
1325 | pr_debug("%s: association:%p updated new path to addr:%pISpc\n", | 1324 | pr_debug("%s: association:%p updated new path to addr:%pISpc\n", |
1326 | __func__, asoc, &asoc->peer.retran_path->ipaddr.sa); | 1325 | __func__, asoc, &asoc->peer.retran_path->ipaddr.sa); |
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index d0810dc5f079..1d348d15b33d 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c | |||
@@ -652,5 +652,4 @@ void sctp_transport_immediate_rtx(struct sctp_transport *t) | |||
652 | if (!mod_timer(&t->T3_rtx_timer, jiffies + t->rto)) | 652 | if (!mod_timer(&t->T3_rtx_timer, jiffies + t->rto)) |
653 | sctp_transport_hold(t); | 653 | sctp_transport_hold(t); |
654 | } | 654 | } |
655 | return; | ||
656 | } | 655 | } |