Skip to content

Commit 69362ce

Browse files
authored
Merge pull request #4185 from jtt/add-missing-ifa-flags
Lift IFA_ -constants from linux/gnu to linux
2 parents 770abef + 70c1e82 commit 69362ce

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

libc-test/semver/linux-gnu.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ HUGETLB_FLAG_ENCODE_64KB
7878
HUGETLB_FLAG_ENCODE_8MB
7979
HUGETLB_FLAG_ENCODE_MASK
8080
HUGETLB_FLAG_ENCODE_SHIFT
81-
IFA_FLAGS
82-
IFA_F_MANAGETEMPADDR
83-
IFA_F_MCAUTOJOIN
84-
IFA_F_NODAD
85-
IFA_F_NOPREFIXROUTE
86-
IFA_F_STABLE_PRIVACY
8781
INIT_PROCESS
8882
ISOFS_SUPER_MAGIC
8983
JFFS2_SUPER_MAGIC

libc-test/semver/linux.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,12 +923,18 @@ IFA_ADDRESS
923923
IFA_ANYCAST
924924
IFA_BROADCAST
925925
IFA_CACHEINFO
926+
IFA_FLAGS
926927
IFA_F_DADFAILED
927928
IFA_F_DEPRECATED
928929
IFA_F_HOMEADDRESS
930+
IFA_F_MANAGETEMPADDR
931+
IFA_F_MCAUTOJOIN
932+
IFA_F_NODAD
933+
IFA_F_NOPREFIXROUTE
929934
IFA_F_OPTIMISTIC
930935
IFA_F_PERMANENT
931936
IFA_F_SECONDARY
937+
IFA_F_STABLE_PRIVACY
932938
IFA_F_TEMPORARY
933939
IFA_F_TENTATIVE
934940
IFA_LABEL

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -960,14 +960,6 @@ pub const NDA_SRC_VNI: c_ushort = 11;
960960
pub const UNAME26: c_int = 0x0020000;
961961
pub const FDPIC_FUNCPTRS: c_int = 0x0080000;
962962

963-
// linux/if_addr.h
964-
pub const IFA_FLAGS: c_ushort = 8;
965-
966-
pub const IFA_F_MANAGETEMPADDR: u32 = 0x100;
967-
pub const IFA_F_NOPREFIXROUTE: u32 = 0x200;
968-
pub const IFA_F_MCAUTOJOIN: u32 = 0x400;
969-
pub const IFA_F_STABLE_PRIVACY: u32 = 0x800;
970-
971963
pub const MAX_LINKS: c_int = 32;
972964

973965
pub const GENL_UNS_ADMIN_PERM: c_int = 0x10;

src/unix/linux_like/linux/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2742,6 +2742,7 @@ pub const IFA_BROADCAST: c_ushort = 4;
27422742
pub const IFA_ANYCAST: c_ushort = 5;
27432743
pub const IFA_CACHEINFO: c_ushort = 6;
27442744
pub const IFA_MULTICAST: c_ushort = 7;
2745+
pub const IFA_FLAGS: c_ushort = 8;
27452746

27462747
pub const IFA_F_SECONDARY: u32 = 0x01;
27472748
pub const IFA_F_TEMPORARY: u32 = 0x01;
@@ -2752,6 +2753,10 @@ pub const IFA_F_HOMEADDRESS: u32 = 0x10;
27522753
pub const IFA_F_DEPRECATED: u32 = 0x20;
27532754
pub const IFA_F_TENTATIVE: u32 = 0x40;
27542755
pub const IFA_F_PERMANENT: u32 = 0x80;
2756+
pub const IFA_F_MANAGETEMPADDR: u32 = 0x100;
2757+
pub const IFA_F_NOPREFIXROUTE: u32 = 0x200;
2758+
pub const IFA_F_MCAUTOJOIN: u32 = 0x400;
2759+
pub const IFA_F_STABLE_PRIVACY: u32 = 0x800;
27552760

27562761
// linux/if_link.h
27572762
pub const IFLA_UNSPEC: c_ushort = 0;

0 commit comments

Comments
 (0)