Skip to content

Commit ca814e8

Browse files
committed
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
2 parents 9bfa899 + b0cc9cf commit ca814e8

File tree

3 files changed

+41
-0
lines changed

3 files changed

+41
-0
lines changed

libc-test/build.rs

+15
Original file line numberDiff line numberDiff line change
@@ -1808,17 +1808,32 @@ fn test_android(target: &str) {
18081808
// FIXME: NDK r22 minimum required
18091809
| "FDB_NOTIFY_BIT"
18101810
| "FDB_NOTIFY_INACTIVE_BIT"
1811+
| "IFLA_ALT_IFNAME"
1812+
| "IFLA_PERM_ADDRESS"
1813+
| "IFLA_PROP_LIST"
1814+
| "IFLA_PROTO_DOWN_REASON"
18111815
| "NDA_FDB_EXT_ATTRS"
18121816
| "NDA_NH_ID"
18131817
| "NFEA_ACTIVITY_NOTIFY"
18141818
| "NFEA_DONT_REFRESH"
18151819
| "NFEA_UNSPEC" => true,
18161820

1821+
// FIXME: NDK r23 minimum required
1822+
| "IFLA_PARENT_DEV_BUS_NAME"
1823+
| "IFLA_PARENT_DEV_NAME" => true,
1824+
18171825
// FIXME: NDK r25 minimum required
1826+
| "IFLA_GRO_MAX_SIZE"
18181827
| "NDA_FLAGS_EXT"
18191828
| "NTF_EXT_MANAGED" => true,
18201829

18211830
// FIXME: NDK above r25 required
1831+
| "IFLA_ALLMULTI"
1832+
| "IFLA_DEVLINK_PORT"
1833+
| "IFLA_GRO_IPV4_MAX_SIZE"
1834+
| "IFLA_GSO_IPV4_MAX_SIZE"
1835+
| "IFLA_TSO_MAX_SEGS"
1836+
| "IFLA_TSO_MAX_SIZE"
18221837
| "NDA_NDM_STATE_MASK"
18231838
| "NDA_NDM_FLAGS_MASK"
18241839
| "NDTPA_INTERVAL_PROBE_TIME_MS"

libc-test/semver/android.txt

+13
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,19 @@ IFLA_CARRIER_DOWN_COUNT
779779
IFLA_NEW_IFINDEX
780780
IFLA_MIN_MTU
781781
IFLA_MAX_MTU
782+
IFLA_PROP_LIST
783+
IFLA_ALT_IFNAME
784+
IFLA_PERM_ADDRESS
785+
IFLA_PROTO_DOWN_REASON
786+
IFLA_PARENT_DEV_NAME
787+
IFLA_PARENT_DEV_BUS_NAME
788+
IFLA_GRO_MAX_SIZE
789+
IFLA_TSO_MAX_SIZE
790+
IFLA_TSO_MAX_SEGS
791+
IFLA_ALLMULTI
792+
IFLA_DEVLINK_PORT
793+
IFLA_GSO_IPV4_MAX_SIZE
794+
IFLA_GRO_IPV4_MAX_SIZE
782795
IFLA_INFO_UNSPEC
783796
IFLA_INFO_KIND
784797
IFLA_INFO_DATA

src/unix/linux_like/android/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -3006,6 +3006,19 @@ pub const IFLA_CARRIER_DOWN_COUNT: ::c_ushort = 48;
30063006
pub const IFLA_NEW_IFINDEX: ::c_ushort = 49;
30073007
pub const IFLA_MIN_MTU: ::c_ushort = 50;
30083008
pub const IFLA_MAX_MTU: ::c_ushort = 51;
3009+
pub const IFLA_PROP_LIST: ::c_ushort = 52;
3010+
pub const IFLA_ALT_IFNAME: ::c_ushort = 53;
3011+
pub const IFLA_PERM_ADDRESS: ::c_ushort = 54;
3012+
pub const IFLA_PROTO_DOWN_REASON: ::c_ushort = 55;
3013+
pub const IFLA_PARENT_DEV_NAME: ::c_ushort = 56;
3014+
pub const IFLA_PARENT_DEV_BUS_NAME: ::c_ushort = 57;
3015+
pub const IFLA_GRO_MAX_SIZE: ::c_ushort = 58;
3016+
pub const IFLA_TSO_MAX_SIZE: ::c_ushort = 59;
3017+
pub const IFLA_TSO_MAX_SEGS: ::c_ushort = 60;
3018+
pub const IFLA_ALLMULTI: ::c_ushort = 61;
3019+
pub const IFLA_DEVLINK_PORT: ::c_ushort = 62;
3020+
pub const IFLA_GSO_IPV4_MAX_SIZE: ::c_ushort = 63;
3021+
pub const IFLA_GRO_IPV4_MAX_SIZE: ::c_ushort = 64;
30093022

30103023
pub const IFLA_INFO_UNSPEC: ::c_ushort = 0;
30113024
pub const IFLA_INFO_KIND: ::c_ushort = 1;

0 commit comments

Comments
 (0)