Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
mptcp: Build-Fix
Browse files Browse the repository at this point in the history 
Fixes: 5ddd596 ("Merge tag 'v4.20' into mptcp_trunk")
Signed-off-by: Christoph Paasch <cpaasch@apple.com>
  • Loading branch information
@cpaasch
cpaasch committed May 23, 2019
1 parent 5ddd596 commit 8b1e8c8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/mptcp/mptcp_output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ int mptcp_write_wakeup(struct sock *meta_sk, int mib)
tcp_event_new_data_sent(meta_sk, skb);

__tcp_push_pending_frames(subsk, mss, TCP_NAGLE_PUSH);
skb->skb_mstamp = meta_tp->tcp_mstamp;
skb->skb_mstamp_ns = meta_tp->tcp_wstamp_ns;
meta_tp->lsndtime = tcp_jiffies32;

return 0;
Expand Down Expand Up @@ -852,7 +852,7 @@ bool mptcp_write_xmit(struct sock *meta_sk, unsigned int mss_now, int nonagle,
* always push on the subflow
*/
__tcp_push_pending_frames(subsk, mss_now, TCP_NAGLE_PUSH);
skb->skb_mstamp = meta_tp->tcp_mstamp;
skb->skb_mstamp_ns = meta_tp->tcp_wstamp_ns;
meta_tp->lsndtime = tcp_jiffies32;

path_mask |= mptcp_pi_to_flag(subtp->mptcp->path_index);
Expand Down Expand Up @@ -1589,7 +1589,7 @@ int mptcp_retransmit_skb(struct sock *meta_sk, struct sk_buff *skb)
}

__tcp_push_pending_frames(subsk, mss_now, TCP_NAGLE_PUSH);
skb->skb_mstamp = meta_tp->tcp_mstamp;
skb->skb_mstamp_ns = meta_tp->tcp_wstamp_ns;
meta_tp->lsndtime = tcp_jiffies32;

return 0;
Expand Down

0 comments on commit 8b1e8c8

Please sign in to comment.