From 1f997a521567531b87763018b22ed6a3c19a3e3f Mon Sep 17 00:00:00 2001
From: John Baublitz <john.m.baublitz@gmail.com>
Date: Wed, 22 May 2019 10:23:02 -0400
Subject: [PATCH] Fix builds by moving the rest of the current constants to
 linux/other/mod.rs to avoid breaking musl

---
 src/unix/notbsd/linux/mod.rs       | 5 -----
 src/unix/notbsd/linux/other/mod.rs | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
index a2d48f32..89c79620 100644
--- a/src/unix/notbsd/linux/mod.rs
+++ b/src/unix/notbsd/linux/mod.rs
@@ -1812,8 +1812,6 @@ pub const NTF_USE: u8 = 0x01;
 pub const NTF_SELF: u8 = 0x02;
 pub const NTF_MASTER: u8 = 0x04;
 pub const NTF_PROXY: u8 = 0x08;
-pub const NTF_EXT_LEARNED: u8 = 0x10;
-pub const NTF_OFFLOADED: u8 = 0x20;
 pub const NTF_ROUTER: u8 = 0x80;
 
 pub const NDA_UNSPEC: ::c_ushort = 0;
@@ -1825,9 +1823,6 @@ pub const NDA_VLAN: ::c_ushort = 5;
 pub const NDA_PORT: ::c_ushort = 6;
 pub const NDA_VNI: ::c_ushort = 7;
 pub const NDA_IFINDEX: ::c_ushort = 8;
-pub const NDA_MASTER: ::c_ushort = 9;
-pub const NDA_LINK_NETNSID: ::c_ushort = 10;
-pub const NDA_SRC_VNI: ::c_ushort = 11;
 
 // linux/rtnetlink.h
 pub const RTM_F_NOTIFY: ::c_uint = 0x100;
diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
index 91b610d1..1e77ab44 100644
--- a/src/unix/notbsd/linux/other/mod.rs
+++ b/src/unix/notbsd/linux/other/mod.rs
@@ -615,6 +615,14 @@ pub const RTA_PAD: ::c_ushort = 24;
 pub const RTA_UID: ::c_ushort = 25;
 pub const RTA_TTL_PROPAGATE: ::c_ushort = 26;
 
+// linux/neighbor.h
+pub const NTF_EXT_LEARNED: u8 = 0x10;
+pub const NTF_OFFLOADED: u8 = 0x20;
+
+pub const NDA_MASTER: ::c_ushort = 9;
+pub const NDA_LINK_NETNSID: ::c_ushort = 10;
+pub const NDA_SRC_VNI: ::c_ushort = 11;
+
 // linux/if_addr.h
 pub const IFA_FLAGS: ::c_ushort = 8;
 
-- 
GitLab