Auto merge of #3277 - dragan-cecavac-nordsec:android/update-linux-if-…

…link, r=JohnTitor android: Update linux/if_link.h constants Update Android `libc/kernel/uapi/linux/if_link.h` IFLA entries. Reference: https://android.googlesource.com/platform/bionic/+/refs/heads/master/libc/kernel/uapi/linux/if_link.h#159
rust-lang · Jul 10, 2023 · ca814e8 · ca814e8
2 parents 9bfa899 + b0cc9cf
commit ca814e8
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -1808,17 +1808,32 @@ fn test_android(target: &str) {
             // FIXME: NDK r22 minimum required
             | "FDB_NOTIFY_BIT"
             | "FDB_NOTIFY_INACTIVE_BIT"
+            | "IFLA_ALT_IFNAME"
+            | "IFLA_PERM_ADDRESS"
+            | "IFLA_PROP_LIST"
+            | "IFLA_PROTO_DOWN_REASON"
             | "NDA_FDB_EXT_ATTRS"
             | "NDA_NH_ID"
             | "NFEA_ACTIVITY_NOTIFY"
             | "NFEA_DONT_REFRESH"
             | "NFEA_UNSPEC" => true,
 
+            // FIXME: NDK r23 minimum required
+            | "IFLA_PARENT_DEV_BUS_NAME"
+            | "IFLA_PARENT_DEV_NAME" => true,
+
             // FIXME: NDK r25 minimum required
+            | "IFLA_GRO_MAX_SIZE"
             | "NDA_FLAGS_EXT"
             | "NTF_EXT_MANAGED" => true,
 
             // FIXME: NDK above r25 required
+            | "IFLA_ALLMULTI"
+            | "IFLA_DEVLINK_PORT"
+            | "IFLA_GRO_IPV4_MAX_SIZE"
+            | "IFLA_GSO_IPV4_MAX_SIZE"
+            | "IFLA_TSO_MAX_SEGS"
+            | "IFLA_TSO_MAX_SIZE"
             | "NDA_NDM_STATE_MASK"
             | "NDA_NDM_FLAGS_MASK"
             | "NDTPA_INTERVAL_PROBE_TIME_MS"

diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -779,6 +779,19 @@ IFLA_CARRIER_DOWN_COUNT
 IFLA_NEW_IFINDEX
 IFLA_MIN_MTU
 IFLA_MAX_MTU
+IFLA_PROP_LIST
+IFLA_ALT_IFNAME
+IFLA_PERM_ADDRESS
+IFLA_PROTO_DOWN_REASON
+IFLA_PARENT_DEV_NAME
+IFLA_PARENT_DEV_BUS_NAME
+IFLA_GRO_MAX_SIZE
+IFLA_TSO_MAX_SIZE
+IFLA_TSO_MAX_SEGS
+IFLA_ALLMULTI
+IFLA_DEVLINK_PORT
+IFLA_GSO_IPV4_MAX_SIZE
+IFLA_GRO_IPV4_MAX_SIZE
 IFLA_INFO_UNSPEC
 IFLA_INFO_KIND
 IFLA_INFO_DATA

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -3006,6 +3006,19 @@ pub const IFLA_CARRIER_DOWN_COUNT: ::c_ushort = 48;
 pub const IFLA_NEW_IFINDEX: ::c_ushort = 49;
 pub const IFLA_MIN_MTU: ::c_ushort = 50;
 pub const IFLA_MAX_MTU: ::c_ushort = 51;
+pub const IFLA_PROP_LIST: ::c_ushort = 52;
+pub const IFLA_ALT_IFNAME: ::c_ushort = 53;
+pub const IFLA_PERM_ADDRESS: ::c_ushort = 54;
+pub const IFLA_PROTO_DOWN_REASON: ::c_ushort = 55;
+pub const IFLA_PARENT_DEV_NAME: ::c_ushort = 56;
+pub const IFLA_PARENT_DEV_BUS_NAME: ::c_ushort = 57;
+pub const IFLA_GRO_MAX_SIZE: ::c_ushort = 58;
+pub const IFLA_TSO_MAX_SIZE: ::c_ushort = 59;
+pub const IFLA_TSO_MAX_SEGS: ::c_ushort = 60;
+pub const IFLA_ALLMULTI: ::c_ushort = 61;
+pub const IFLA_DEVLINK_PORT: ::c_ushort = 62;
+pub const IFLA_GSO_IPV4_MAX_SIZE: ::c_ushort = 63;
+pub const IFLA_GRO_IPV4_MAX_SIZE: ::c_ushort = 64;
 
 pub const IFLA_INFO_UNSPEC: ::c_ushort = 0;
 pub const IFLA_INFO_KIND: ::c_ushort = 1;