Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lift IFA_ -constants from linux/gnu to linux #4185

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions libc-test/semver/linux-gnu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ HUGETLB_FLAG_ENCODE_64KB
HUGETLB_FLAG_ENCODE_8MB
HUGETLB_FLAG_ENCODE_MASK
HUGETLB_FLAG_ENCODE_SHIFT
IFA_FLAGS
IFA_F_MANAGETEMPADDR
IFA_F_MCAUTOJOIN
IFA_F_NODAD
IFA_F_NOPREFIXROUTE
IFA_F_STABLE_PRIVACY
INIT_PROCESS
ISOFS_SUPER_MAGIC
JFFS2_SUPER_MAGIC
Expand Down
6 changes: 6 additions & 0 deletions libc-test/semver/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -923,12 +923,18 @@ IFA_ADDRESS
IFA_ANYCAST
IFA_BROADCAST
IFA_CACHEINFO
IFA_FLAGS
IFA_F_DADFAILED
IFA_F_DEPRECATED
IFA_F_HOMEADDRESS
IFA_F_MANAGETEMPADDR
IFA_F_MCAUTOJOIN
IFA_F_NODAD
IFA_F_NOPREFIXROUTE
IFA_F_OPTIMISTIC
IFA_F_PERMANENT
IFA_F_SECONDARY
IFA_F_STABLE_PRIVACY
IFA_F_TEMPORARY
IFA_F_TENTATIVE
IFA_LABEL
Expand Down
8 changes: 0 additions & 8 deletions src/unix/linux_like/linux/gnu/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -960,14 +960,6 @@ pub const NDA_SRC_VNI: c_ushort = 11;
pub const UNAME26: c_int = 0x0020000;
pub const FDPIC_FUNCPTRS: c_int = 0x0080000;

// linux/if_addr.h
pub const IFA_FLAGS: c_ushort = 8;

pub const IFA_F_MANAGETEMPADDR: u32 = 0x100;
pub const IFA_F_NOPREFIXROUTE: u32 = 0x200;
pub const IFA_F_MCAUTOJOIN: u32 = 0x400;
pub const IFA_F_STABLE_PRIVACY: u32 = 0x800;

pub const MAX_LINKS: c_int = 32;

pub const GENL_UNS_ADMIN_PERM: c_int = 0x10;
Expand Down
5 changes: 5 additions & 0 deletions src/unix/linux_like/linux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2742,6 +2742,7 @@ pub const IFA_BROADCAST: c_ushort = 4;
pub const IFA_ANYCAST: c_ushort = 5;
pub const IFA_CACHEINFO: c_ushort = 6;
pub const IFA_MULTICAST: c_ushort = 7;
pub const IFA_FLAGS: c_ushort = 8;

pub const IFA_F_SECONDARY: u32 = 0x01;
pub const IFA_F_TEMPORARY: u32 = 0x01;
Expand All @@ -2752,6 +2753,10 @@ pub const IFA_F_HOMEADDRESS: u32 = 0x10;
pub const IFA_F_DEPRECATED: u32 = 0x20;
pub const IFA_F_TENTATIVE: u32 = 0x40;
pub const IFA_F_PERMANENT: u32 = 0x80;
pub const IFA_F_MANAGETEMPADDR: u32 = 0x100;
pub const IFA_F_NOPREFIXROUTE: u32 = 0x200;
pub const IFA_F_MCAUTOJOIN: u32 = 0x400;
pub const IFA_F_STABLE_PRIVACY: u32 = 0x800;

// linux/if_link.h
pub const IFLA_UNSPEC: c_ushort = 0;
Expand Down
Loading