diff options
| author | David S. Miller | 2009-11-29 09:57:15 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-11-29 09:57:15 +0100 |
| commit | 9b963e5d0e01461099a40117b05480f24b63381f (patch) | |
| tree | 4756d554e37bf4ab7202f2c564cbe629af98b576 /net/sctp/outqueue.c | |
| parent | ixgbe: Display currently attached PHY through ethtool (diff) | |
| parent | sctp: on T3_RTX retransmit all the in-flight chunks (diff) | |
| download | kernel-qcow2-linux-9b963e5d0e01461099a40117b05480f24b63381f.tar.gz kernel-qcow2-linux-9b963e5d0e01461099a40117b05480f24b63381f.tar.xz kernel-qcow2-linux-9b963e5d0e01461099a40117b05480f24b63381f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c
Diffstat (limited to 'net/sctp/outqueue.c')
| -rw-r--r-- | net/sctp/outqueue.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 2f2377369e2b..e231a9831016 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -423,16 +423,6 @@ void sctp_retransmit_mark(struct sctp_outq *q, if ((reason == SCTP_RTXR_FAST_RTX && (chunk->fast_retransmit == SCTP_NEED_FRTX)) || (reason != SCTP_RTXR_FAST_RTX && !chunk->tsn_gap_acked)) { - /* If this chunk was sent less then 1 rto ago, do not - * retransmit this chunk, but give the peer time - * to acknowlege it. Do this only when - * retransmitting due to T3 timeout. - */ - if (reason == SCTP_RTXR_T3_RTX && - time_before(jiffies, chunk->sent_at + - transport->last_rto)) - continue; - /* RFC 2960 6.2.1 Processing a Received SACK * * C) Any time a DATA chunk is marked for |