diff options
author | David S. Miller <davem@davemloft.net> | 2015-05-04 19:36:07 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-04 19:36:07 (GMT) |
commit | 73e84313ee4178cac628009103a901af9dfe8920 (patch) | |
tree | 6328e1f97e4757dcf59d99e97eb2b70b352e62da /net/ipv4/tcp_fastopen.c | |
parent | e2783717a71e9babfdd7c36c7e35b790d2c01022 (diff) | |
parent | 1add15646672ff4e7fe59bec2afcb5a0c80c5e49 (diff) | |
download | linux-73e84313ee4178cac628009103a901af9dfe8920.tar.xz |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-05-04
Here's the first bluetooth-next pull request for 4.2:
- Various fixes for at86rf230 driver
- ieee802154: trace events support for rdev->ops
- HCI UART driver refactoring
- New Realtek IDs added to btusb driver
- Off-by-one fix for rtl8723b in btusb driver
- Refactoring of btbcm driver for both UART & USB use
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_fastopen.c')
-rw-r--r-- | net/ipv4/tcp_fastopen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c index e3d87ac..3c673d5 100644 --- a/net/ipv4/tcp_fastopen.c +++ b/net/ipv4/tcp_fastopen.c @@ -206,6 +206,7 @@ static bool tcp_fastopen_create_child(struct sock *sk, skb_set_owner_r(skb2, child); __skb_queue_tail(&child->sk_receive_queue, skb2); tp->syn_data_acked = 1; + tp->bytes_received = end_seq - TCP_SKB_CB(skb)->seq - 1; } else { end_seq = TCP_SKB_CB(skb)->seq + 1; } |