diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-10 02:20:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-10 02:20:14 +0100 |
| commit | 34f9f437104b86f6ddfa2770e2cd852846385dc3 (patch) | |
| tree | 6c78386b3db9dd47fd2b79efb4dcf8c1472de99e /net/sctp/transport.c | |
| parent | pkt_sched: give visibility to mq slave qdiscs (diff) | |
| parent | packet: fix send path when running with proto == 0 (diff) | |
| download | linux-34f9f437104b86f6ddfa2770e2cd852846385dc3.tar.xz linux-34f9f437104b86f6ddfa2770e2cd852846385dc3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' into 'net-next' to get the AF_PACKET bug fix that
Daniel's direct transmit changes depend upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/transport.c')
| -rw-r--r-- | net/sctp/transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 1d4f3ac29baf..d0810dc5f079 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -572,7 +572,7 @@ void sctp_transport_burst_limited(struct sctp_transport *t) u32 old_cwnd = t->cwnd; u32 max_burst_bytes; - if (t->burst_limited) + if (t->burst_limited || asoc->max_burst == 0) return; max_burst_bytes = t->flight_size + (asoc->max_burst * asoc->pathmtu); |