Skip to content

Commit 8d97487

Browse files
Asbjørn Sloth Tønnesenzx2c4
authored andcommitted
wireguard: uapi: move flag enums
Move the wg*_flag enums, so they are defined above the attribute set enums, where ynl-gen would place them. This is an incremental step towards adopting an UAPI header generated by ynl-gen. This is split out to keep the patches readable. This is a trivial patch with no behavioural changes intended. Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
1 parent b5c5a82 commit 8d97487

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

include/uapi/linux/wireguard.h

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@ enum wgdevice_flag {
1515
WGDEVICE_F_REPLACE_PEERS = 1U << 0,
1616
__WGDEVICE_F_ALL = WGDEVICE_F_REPLACE_PEERS
1717
};
18+
19+
enum wgpeer_flag {
20+
WGPEER_F_REMOVE_ME = 1U << 0,
21+
WGPEER_F_REPLACE_ALLOWEDIPS = 1U << 1,
22+
WGPEER_F_UPDATE_ONLY = 1U << 2,
23+
__WGPEER_F_ALL = WGPEER_F_REMOVE_ME | WGPEER_F_REPLACE_ALLOWEDIPS |
24+
WGPEER_F_UPDATE_ONLY
25+
};
26+
27+
enum wgallowedip_flag {
28+
WGALLOWEDIP_F_REMOVE_ME = 1U << 0,
29+
__WGALLOWEDIP_F_ALL = WGALLOWEDIP_F_REMOVE_ME
30+
};
31+
1832
enum wgdevice_attribute {
1933
WGDEVICE_A_UNSPEC,
2034
WGDEVICE_A_IFINDEX,
@@ -29,13 +43,6 @@ enum wgdevice_attribute {
2943
};
3044
#define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1)
3145

32-
enum wgpeer_flag {
33-
WGPEER_F_REMOVE_ME = 1U << 0,
34-
WGPEER_F_REPLACE_ALLOWEDIPS = 1U << 1,
35-
WGPEER_F_UPDATE_ONLY = 1U << 2,
36-
__WGPEER_F_ALL = WGPEER_F_REMOVE_ME | WGPEER_F_REPLACE_ALLOWEDIPS |
37-
WGPEER_F_UPDATE_ONLY
38-
};
3946
enum wgpeer_attribute {
4047
WGPEER_A_UNSPEC,
4148
WGPEER_A_PUBLIC_KEY,
@@ -52,10 +59,6 @@ enum wgpeer_attribute {
5259
};
5360
#define WGPEER_A_MAX (__WGPEER_A_LAST - 1)
5461

55-
enum wgallowedip_flag {
56-
WGALLOWEDIP_F_REMOVE_ME = 1U << 0,
57-
__WGALLOWEDIP_F_ALL = WGALLOWEDIP_F_REMOVE_ME
58-
};
5962
enum wgallowedip_attribute {
6063
WGALLOWEDIP_A_UNSPEC,
6164
WGALLOWEDIP_A_FAMILY,

0 commit comments

Comments
 (0)