| Message ID | 1410016700-9145-1-git-send-email-ncardwell@google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, 2014-09-06 at 11:18 -0400, Neal Cardwell wrote: > The TCP_SKB_CB(skb)->when field no longer exists as of recent change > 7faee5c0d514 ("tcp: remove TCP_SKB_CB(skb)->when"). And in any case, > tcp_fragment() is called on already-transmitted packets from the > __tcp_retransmit_skb() call site, so copying timestamps of any kind > in this spot is quite sensible. > > Signed-off-by: Neal Cardwell <ncardwell@google.com> > Reported-by: Yuchung Cheng <ycheng@google.com> > --- > net/ipv4/tcp_output.c | 3 --- Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Neal Cardwell <ncardwell@google.com> Date: Sat, 6 Sep 2014 11:18:20 -0400 > The TCP_SKB_CB(skb)->when field no longer exists as of recent change > 7faee5c0d514 ("tcp: remove TCP_SKB_CB(skb)->when"). And in any case, > tcp_fragment() is called on already-transmitted packets from the > __tcp_retransmit_skb() call site, so copying timestamps of any kind > in this spot is quite sensible. > > Signed-off-by: Neal Cardwell <ncardwell@google.com> > Reported-by: Yuchung Cheng <ycheng@google.com> Applied, thanks Neal. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 3b22dcb..7f1280d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1146,9 +1146,6 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, buff->ip_summed = skb->ip_summed; - /* Looks stupid, but our code really uses when of - * skbs, which it never sent before. --ANK - */ buff->tstamp = skb->tstamp; tcp_fragment_tstamp(skb, buff);
The TCP_SKB_CB(skb)->when field no longer exists as of recent change 7faee5c0d514 ("tcp: remove TCP_SKB_CB(skb)->when"). And in any case, tcp_fragment() is called on already-transmitted packets from the __tcp_retransmit_skb() call site, so copying timestamps of any kind in this spot is quite sensible. Signed-off-by: Neal Cardwell <ncardwell@google.com> Reported-by: Yuchung Cheng <ycheng@google.com> --- net/ipv4/tcp_output.c | 3 --- 1 file changed, 3 deletions(-)