diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 14:05:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:35:42 +0200 |
| commit | 14d597b74aed3c44af0ee8f5ea24b970a50aec99 (patch) | |
| tree | 7cd25aa0621ccc82dd2b613656e74aacdf4afdde /net/sctp/output.c | |
| parent | 8caec0d048609ccf8c75025b0d73af10f74e2157 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
| download | linux-14d597b74aed3c44af0ee8f5ea24b970a50aec99.tar.gz | |
Merge tag 'v3.5-rc6' into next/dt
New pull requests are based on Linux 3.5-rc6
Diffstat (limited to 'net/sctp/output.c')
| -rw-r--r-- | net/sctp/output.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index f1b7d4bb591e..6ae47acaaec6 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -248,6 +248,11 @@ static sctp_xmit_t sctp_packet_bundle_sack(struct sctp_packet *pkt, /* If the SACK timer is running, we have a pending SACK */ if (timer_pending(timer)) { struct sctp_chunk *sack; + + if (pkt->transport->sack_generation != + pkt->transport->asoc->peer.sack_generation) + return retval; + asoc->a_rwnd = asoc->rwnd; sack = sctp_make_sack(asoc); if (sack) { |