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 A4FA8151988; Wed, 5 Feb 2025 14:35:55 +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=1738766155; cv=none; b=dU+NdEeUDMmV1pHe31SpqSdMtvzSIqIhxk44lYKv/rz2IdwReQYBOpp3neY1dstV0Pu9h4boYvBt0SAzdPb9BK74nOd9APKF9eQbEhgWVZ3qX1Zp4n9j/bDFopjt+tmLMJk+IwKwEgAiDAgo09M2yqJgCBy4sa0tcb1a8Z2YQDs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766155; c=relaxed/simple; bh=pwhhGS27Qo5M85M5Pd1gytO4cnn1ZXKrTGYcwPeYPNQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E/irkgtl/bpyNxXQotnaKGcfr4+IyfqASwDjshhd46Aj6TIb4lVn0O8v1yHE3VMeaxfRtEC0SE6W32Sg+JoMqFA/KVa2M0+AgxYHKU9ISEuG2PuGMBetJWe8xn4WFWooStta6wByC/UK8WRiwGTHeo6RuDb2MZ//QvHXxu0cz5U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zC5rF/Ef; 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="zC5rF/Ef" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 252EFC4CED1; Wed, 5 Feb 2025 14:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738766155; bh=pwhhGS27Qo5M85M5Pd1gytO4cnn1ZXKrTGYcwPeYPNQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zC5rF/EfAS+tF/bmgUwYL9Rwxp04sGieCA7sp+b1fm0aCrWC/leSZNUB5LpfEeUCc XZIJ5vMYs9eGEvbbJA28m397P1TjyTxhyebY1L9qYSnyCF7wU4IfwWlEoruQbhESsW 4bQKPb605xYB77NK7olZMCxpwCW4CI4iGAg7qA70= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vishal Chourasia , Song Yoong Siang , Daniel Borkmann , Sasha Levin Subject: [PATCH 6.12 292/590] tools: Sync if_xdp.h uapi tooling header Date: Wed, 5 Feb 2025 14:40:47 +0100 Message-ID: <20250205134506.449150706@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vishal Chourasia [ Upstream commit 01f3ce5328c405179b2c69ea047c423dad2bfa6d ] Sync if_xdp.h uapi header to remove following warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h' Fixes: 48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support") Signed-off-by: Vishal Chourasia Signed-off-by: Song Yoong Siang Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20250115032248.125742-1-yoong.siang.song@intel.com Signed-off-by: Sasha Levin --- tools/include/uapi/linux/if_xdp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/if_xdp.h b/tools/include/uapi/linux/if_xdp.h index 2f082b01ff228..42ec5ddaab8dc 100644 --- a/tools/include/uapi/linux/if_xdp.h +++ b/tools/include/uapi/linux/if_xdp.h @@ -117,12 +117,12 @@ struct xdp_options { ((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1) /* Request transmit timestamp. Upon completion, put it into tx_timestamp - * field of union xsk_tx_metadata. + * field of struct xsk_tx_metadata. */ #define XDP_TXMD_FLAGS_TIMESTAMP (1 << 0) /* Request transmit checksum offload. Checksum start position and offset - * are communicated via csum_start and csum_offset fields of union + * are communicated via csum_start and csum_offset fields of struct * xsk_tx_metadata. */ #define XDP_TXMD_FLAGS_CHECKSUM (1 << 1) -- 2.39.5