From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7EDDC43219 for ; Sun, 28 Apr 2019 05:53:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CA252075D for ; Sun, 28 Apr 2019 05:53:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sydney.edu.au header.i=@sydney.edu.au header.b="j4Xj5K6e" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726253AbfD1FxE (ORCPT ); Sun, 28 Apr 2019 01:53:04 -0400 Received: from au-smtp-delivery-110.mimecast.com ([180.189.28.110]:38217 "EHLO au-smtp-delivery-110.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725999AbfD1FxE (ORCPT ); Sun, 28 Apr 2019 01:53:04 -0400 X-Greylist: delayed 361 seconds by postgrey-1.27 at vger.kernel.org; Sun, 28 Apr 2019 01:53:02 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sydney.edu.au; s=mimecast20161123; t=1556430781; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=xyUDD5AZ4EYcfVHtwprd1dFQIdxfKsLIvc38mwWHi4I=; b=j4Xj5K6ebrD+iMSSeH6UT9ElupxgPxuR4Ri7KzHMrU/w41IfasFK01l99kinomML/cLsz7HaEQMBewELhvy3GFwA+BweFEqRG7P58xg/mr4dRefj3NOiGIsY7mkfVWF+pC9I0Y8SvW615Pr6XSj8BwAy3pvyea06nxYST1Bi7HQ= Received: from EX-TPR-PRO-05.mcs.usyd.edu.au (129.78.56.252 [129.78.56.252]) (Using TLS) by relay.mimecast.com with ESMTP id au-mta-56-4Io32hgdNaWjiI4mXY6p3g-1; Sun, 28 Apr 2019 15:45:22 +1000 Received: from exchpa00450.mcs.usyd.edu.au (10.83.31.38) by EX-TPR-PRO-05.mcs.usyd.edu.au (172.17.63.54) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 28 Apr 2019 15:45:22 +1000 Received: from localhost (172.20.34.21) by exchpa00450.mcs.usyd.edu.au (10.83.31.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1531.3; Sun, 28 Apr 2019 15:45:21 +1000 Date: Sun, 28 Apr 2019 15:45:21 +1000 From: Stephen Mallon To: "David S. Miller" CC: , Subject: [PATCH net] ipv4: Fix updating SOF_TIMESTAMPING_OPT_ID when SKBTX_HW_TSTAMP is enabled Message-ID: <20190428054521.GA14504@stephen-mallon> MIME-Version: 1.0 User-Agent: Mutt/1.11.3 (2019-02-01) X-Originating-IP: [172.20.34.21] X-ClientProxiedBy: exchpa00448.mcs.usyd.edu.au (10.83.31.36) To exchpa00450.mcs.usyd.edu.au (10.83.31.38) X-MC-Unique: 4Io32hgdNaWjiI4mXY6p3g-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Ensure that the unique timestamp identifier is incremented for skb hardware timestamps, not just software timestamps. Signed-off-by: Stephen Mallon --- net/ipv4/ip_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index c80188875f39..96ef1d467ba7 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -891,7 +891,7 @@ static int __ip_append_data(struct sock *sk, =09mtu =3D cork->gso_size ? IP_MAX_MTU : cork->fragsize; =09paged =3D !!cork->gso_size; =20 -=09if (cork->tx_flags & SKBTX_ANY_SW_TSTAMP && +=09if (cork->tx_flags & SKBTX_ANY_TSTAMP && =09 sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) =09=09tskey =3D sk->sk_tskey++; =20 --=20 2.18.1