From dfb119de268005f234e82ade1419b52bf67d7700 Mon Sep 17 00:00:00 2001 From: John Baublitz Date: Fri, 24 May 2019 09:27:50 -0400 Subject: Fix CI errors by moving non-musl netlink constants to linux/other/mod.rs --- src/unix/notbsd/linux/mod.rs | 6 ------ src/unix/notbsd/linux/other/mod.rs | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 2d40ca6d31..8032a36382 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -1836,15 +1836,9 @@ pub const TCA_OPTIONS: ::c_ushort = 2; pub const TCA_STATS: ::c_ushort = 3; pub const TCA_XSTATS: ::c_ushort = 4; pub const TCA_RATE: ::c_ushort = 5; - -// possibly should go in linux/other/mod.rs pub const TCA_FCNT: ::c_ushort = 6; pub const TCA_STATS2: ::c_ushort = 7; pub const TCA_STAB: ::c_ushort = 8; -pub const TCA_PAD: ::c_ushort = 9; -pub const TCA_DUMP_INVISIBLE: ::c_ushort = 10; -pub const TCA_CHAIN: ::c_ushort = 11; -pub const TCA_HW_OFFLOAD: ::c_ushort = 12; pub const RTM_F_NOTIFY: ::c_uint = 0x100; pub const RTM_F_CLONED: ::c_uint = 0x200; diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index 5f646090fa..e82ee4fa09 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -604,6 +604,11 @@ pub const LINUX_REBOOT_CMD_SW_SUSPEND: ::c_int = 0xD000FCE2; pub const LINUX_REBOOT_CMD_KEXEC: ::c_int = 0x45584543; // linux/rtnetlink.h +pub const TCA_PAD: ::c_ushort = 9; +pub const TCA_DUMP_INVISIBLE: ::c_ushort = 10; +pub const TCA_CHAIN: ::c_ushort = 11; +pub const TCA_HW_OFFLOAD: ::c_ushort = 12; + pub const RTM_F_LOOKUP_TABLE: ::c_uint = 0x1000; pub const RTM_F_FIB_MATCH: ::c_uint = 0x2000; -- cgit v1.2.1