diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-22 20:53:09 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-22 20:53:09 +0400 |
| commit | ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06 (patch) | |
| tree | a5b4cd52ec5e27d169bf3115d732d2106bc78fc2 /net | |
| parent | 2fa70df935585479f974766d84fa68af462a25a5 (diff) | |
| parent | f4541d60a449afd40448b06496dcd510f505928e (diff) | |
| download | linux-ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull to get the thermal netlink multicast group name fix, otherwise
the assertion added in net-next to netlink to detect that kind of bug
makes systems unbootable for some folks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/sco.c | 1 | ||||
| -rw-r--r-- | net/ipv4/tcp_output.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 79d87d8d4f51..fad0302bdb32 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -359,6 +359,7 @@ static void __sco_sock_close(struct sock *sk) sco_chan_del(sk, ECONNRESET); break; + case BT_CONNECT2: case BT_CONNECT: case BT_DISCONN: sco_chan_del(sk, ECONNRESET); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 163cf5fc0119..af354c98fdb5 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1640,8 +1640,11 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb) goto send_now; } - /* Ok, it looks like it is advisable to defer. */ - tp->tso_deferred = 1 | (jiffies << 1); + /* Ok, it looks like it is advisable to defer. + * Do not rearm the timer if already set to not break TCP ACK clocking. + */ + if (!tp->tso_deferred) + tp->tso_deferred = 1 | (jiffies << 1); return true; |