diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-20 23:20:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-20 23:20:32 +0200 |
| commit | 464b5847e61085f81bb99ce48eb427a0dc7617dc (patch) | |
| tree | 805c97855a9a13c06910687bbbbe3eb7bc371902 /net/ipv4/tcp_fastopen.c | |
| parent | 0a30d69195604f136a4e3bfaf453f742e583ce95 (diff) | |
| parent | e875bd66dfb68f4e898e9a43ef42858c504a7f23 (diff) | |
| download | linux-464b5847e61085f81bb99ce48eb427a0dc7617dc.tar.gz linux-464b5847e61085f81bb99ce48eb427a0dc7617dc.tar.bz2 linux-464b5847e61085f81bb99ce48eb427a0dc7617dc.zip | |
Merge branch 'irq/urgent' into irq/core
Merge urgent fixes so pending patches for 4.9 can be applied.
Diffstat (limited to 'net/ipv4/tcp_fastopen.c')
| -rw-r--r-- | net/ipv4/tcp_fastopen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c index 54d9f9b0120f..4e777a3243f9 100644 --- a/net/ipv4/tcp_fastopen.c +++ b/net/ipv4/tcp_fastopen.c @@ -150,6 +150,7 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb) tp->segs_in = 0; tcp_segs_in(tp, skb); __skb_pull(skb, tcp_hdrlen(skb)); + sk_forced_mem_schedule(sk, skb->truesize); skb_set_owner_r(skb, sk); TCP_SKB_CB(skb)->seq++; @@ -226,6 +227,7 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk, tcp_fastopen_add_skb(child, skb); tcp_rsk(req)->rcv_nxt = tp->rcv_nxt; + tp->rcv_wup = tp->rcv_nxt; /* tcp_conn_request() is sending the SYNACK, * and queues the child into listener accept queue. */ |