From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01DA919C554; Mon, 23 Jun 2025 21:27:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714077; cv=none; b=VtuvwD7UbB4tXhxSLaWo3PTDiKaDC4Rb2M/KxHl6UU+1JuyfSvFeDm/vrGHrzgtEpi96UGpRQGOGAprHd2eeGAC+I+Oyx2rwmjm2g1Zqm/vvbqfd1i8exe92P56RCAKQLU03XVcoDwSpBqQYcyZBHbBgrmUC+WejfIQPQZoyDFc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714077; c=relaxed/simple; bh=+KVla1/fCKrRqDNOt8V2AvUsHYN9CYv4eZx4O9Dtmkw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZR2xmY4qfaFOuerhnd//JSEHznOi/AOL/FIQvmxTGmJpEqPL3pReIlBL6hmBKRAXTVAAmxd5BuvvS+aD1qJ43nG4bjwGLhDJxzpfDgZBIvMqRXwpSPV8mdCCUCNAlJItiLf8O3tYHzypjgsx3LubIv1KS1ZYYfvnOyzKjoDVXSk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lT6MgWaf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lT6MgWaf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F029C4CEF0; Mon, 23 Jun 2025 21:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714076; bh=+KVla1/fCKrRqDNOt8V2AvUsHYN9CYv4eZx4O9Dtmkw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lT6MgWafV2LhUD/VkOLRrNrz7cES+nSS+VP6Zl5BrWQfYExNQM8yPsj4joXsL3cjP 4gvDolf/y3wGWi+Q3jAqSAm4I6fpW8HqhWgWMwXBYjXhxlQKeB8T7aO4hbz6By9a5r QdXXWiQNX6G98tBYkmnn3JygiUQmucnioLheJru0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Xing , Tariq Toukan , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.15 362/592] net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info Date: Mon, 23 Jun 2025 15:05:20 +0200 Message-ID: <20250623130709.054440591@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130700.210182694@linuxfoundation.org> References: <20250623130700.210182694@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Xing [ Upstream commit b86bcfee30576b752302c55693fff97242b35dfd ] As mlx4 has implemented skb_tx_timestamp() in mlx4_en_xmit(), the SOFTWARE flag is surely needed when users are trying to get timestamp information. Signed-off-by: Jason Xing Reviewed-by: Tariq Toukan Link: https://patch.msgid.link/20250510093442.79711-1-kerneljasonxing@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index cd17a3f4faf83..a68cd3f0304c6 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -1897,6 +1897,7 @@ static int mlx4_en_get_ts_info(struct net_device *dev, if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) { info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE | + SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_RX_HARDWARE | SOF_TIMESTAMPING_RAW_HARDWARE; -- 2.39.5