From nobody Fri Oct 3 06:37:15 2025 Received: from mail1.fiberby.net (mail1.fiberby.net [193.104.135.124]) (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 B6E3B2E975E; Thu, 4 Sep 2025 22:03:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.104.135.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757023414; cv=none; b=iTllEApqzbrHj3Nq66+ingV6KtMcbPYXKcWqXvlN3ZSDNS9CaOco4QiwMz0g5EYQehOOq3OB4LlMjs1LZ4Ya7KDkTINVEZtHHgFdmx4XqvNUGSn2Y+xoZ+m2w3w0CYtNC81m2lswOnpVdujOBJtpxLv4MbjC64PmQ6Ded4Fo/H4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757023414; c=relaxed/simple; bh=121vixZVyWdpVnNNIFvoWmdEy0OO+Zl65XWR5OE1tLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WqB2rAxnDJDjpBEy26hLR4bNKDMy6GQ0vUCs3Is4Lox5ui8tSZGNs3IR0aAhFzZx4NRfSLrIcZN5Q5flm3fK96MTZTZPyScLh9lQ0CxFjxMkA1SaUl/9lS6UWF/ONHl7/YP3tVw0o/FCZ602WpGFtbJ20EDgdDfORNKEOJiLEDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net; spf=pass smtp.mailfrom=fiberby.net; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b=FP2Bejtv; arc=none smtp.client-ip=193.104.135.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fiberby.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b="FP2Bejtv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1757023398; bh=121vixZVyWdpVnNNIFvoWmdEy0OO+Zl65XWR5OE1tLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FP2BejtvAsJh7YFQdMgwp8FMpDrroAdmxWJfk+VTiAEkYKkCcH4qH2rypSLSPsn70 lQTsoSNJIfmXwhsugI2uaBUJWa55ceguOolrLRq0vw1uOCtaVNe6gWdZLuOefW438P nrQtoS82nYLP5N/QMOUc7tWl0bcH8EjLynuL2sicKiuO0EuiD8PB68VnvSvToircii okZjy4jCtVJRjoXdgiHOs74fFwM2LNNIa5HjFVmWcyCj3r+nz9KOMxQAlNAVZGlAoI KusbL9Ds0xfPlvzc3vXb1BRqIY2uS01zZMR4uOC+oPTcwvY0I4SgZSPzwZp9lu5svH i9ony3xmVz6Sg== Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id B7A6C60396; Thu, 4 Sep 2025 22:03:18 +0000 (UTC) Received: by x201s (Postfix, from userid 1000) id 7B28E2029CD; Thu, 04 Sep 2025 22:02:58 +0000 (UTC) From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: "Jason A. Donenfeld" , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Donald Hunter , Simon Horman , Jacob Keller , Andrew Lunn , wireguard@lists.zx2c4.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC net-next 07/14] uapi: wireguard: move flag enums Date: Thu, 4 Sep 2025 22:02:41 +0000 Message-ID: <20250904220255.1006675-7-ast@fiberby.net> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904-wg-ynl-rfc@fiberby.net> References: <20250904-wg-ynl-rfc@fiberby.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Move the wg*_flag enums, so that they are defined above the attribute set enums, as ynl-gen would place them. While touching these lines, also pre-compute bitshifted flag values, like ynl-gen would generate them. This is an incremental step towards adopting an UAPI header generated by ynl-gen. This is a trivial patch with no behavioural changes intended. Signed-off-by: Asbj=C3=B8rn Sloth T=C3=B8nnesen --- include/uapi/linux/wireguard.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/wireguard.h b/include/uapi/linux/wireguard.h index ee63aba7f98f..623ec9527e22 100644 --- a/include/uapi/linux/wireguard.h +++ b/include/uapi/linux/wireguard.h @@ -15,6 +15,20 @@ enum wgdevice_flag { WGDEVICE_F_REPLACE_PEERS =3D 1U << 0, __WGDEVICE_F_ALL =3D WGDEVICE_F_REPLACE_PEERS }; + +enum wgpeer_flag { + WGPEER_F_REMOVE_ME =3D 1, + WGPEER_F_REPLACE_ALLOWEDIPS =3D 2, + WGPEER_F_UPDATE_ONLY =3D 4, + __WGPEER_F_ALL =3D WGPEER_F_REMOVE_ME | WGPEER_F_REPLACE_ALLOWEDIPS | + WGPEER_F_UPDATE_ONLY +}; + +enum wgallowedip_flag { + WGALLOWEDIP_F_REMOVE_ME =3D 1, + __WGALLOWEDIP_F_ALL =3D WGALLOWEDIP_F_REMOVE_ME +}; + enum wgdevice_attribute { WGDEVICE_A_UNSPEC, WGDEVICE_A_IFINDEX, @@ -30,13 +44,6 @@ enum wgdevice_attribute { }; #define WGDEVICE_A_MAX (__WGDEVICE_A_MAX - 1) =20 -enum wgpeer_flag { - WGPEER_F_REMOVE_ME =3D 1U << 0, - WGPEER_F_REPLACE_ALLOWEDIPS =3D 1U << 1, - WGPEER_F_UPDATE_ONLY =3D 1U << 2, - __WGPEER_F_ALL =3D WGPEER_F_REMOVE_ME | WGPEER_F_REPLACE_ALLOWEDIPS | - WGPEER_F_UPDATE_ONLY -}; enum wgpeer_attribute { WGPEER_A_UNSPEC, WGPEER_A_PUBLIC_KEY, @@ -54,10 +61,6 @@ enum wgpeer_attribute { }; #define WGPEER_A_MAX (__WGPEER_A_MAX - 1) =20 -enum wgallowedip_flag { - WGALLOWEDIP_F_REMOVE_ME =3D 1U << 0, - __WGALLOWEDIP_F_ALL =3D WGALLOWEDIP_F_REMOVE_ME -}; enum wgallowedip_attribute { WGALLOWEDIP_A_UNSPEC, WGALLOWEDIP_A_FAMILY, --=20 2.51.0