Skip to content

Commit 0c1079d

Browse files
committed
Auto merge of rust-lang#3053 - tones111:rtnl_if_attr_tags, r=JohnTitor
linux: add additional netlink interface attribute tags
2 parents f1bb40a + 8b91201 commit 0c1079d

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

libc-test/build.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3643,6 +3643,15 @@ fn test_linux(target: &str) {
36433643
// Added in Linux 5.13
36443644
"PTRACE_GET_RSEQ_CONFIGURATION" if sparc64 => true,
36453645

3646+
// FIXME: Requires more recent kernel headers
3647+
| "IFLA_PARENT_DEV_NAME" // linux v5.13+
3648+
| "IFLA_PARENT_DEV_BUS_NAME" // linux v5.13+
3649+
| "IFLA_GRO_MAX_SIZE" // linux v5.16+
3650+
| "IFLA_TSO_MAX_SIZE" // linux v5.18+
3651+
| "IFLA_TSO_MAX_SEGS" // linux v5.18+
3652+
| "IFLA_ALLMULTI" // linux v6.0+
3653+
=> true,
3654+
36463655
_ => false,
36473656
}
36483657
});

libc-test/semver/linux.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,7 @@ IFF_UP
836836
IFF_VNET_HDR
837837
IFLA_ADDRESS
838838
IFLA_AF_SPEC
839+
IFLA_ALLMULTI
839840
IFLA_ALT_IFNAME
840841
IFLA_BROADCAST
841842
IFLA_CARRIER
@@ -845,6 +846,7 @@ IFLA_CARRIER_UP_COUNT
845846
IFLA_COST
846847
IFLA_EVENT
847848
IFLA_EXT_MASK
849+
IFLA_GRO_MAX_SIZE
848850
IFLA_GROUP
849851
IFLA_GSO_MAX_SEGS
850852
IFLA_GSO_MAX_SIZE
@@ -875,6 +877,8 @@ IFLA_NUM_TX_QUEUES
875877
IFLA_NUM_VF
876878
IFLA_OPERSTATE
877879
IFLA_PAD
880+
IFLA_PARENT_DEV_BUS_NAME
881+
IFLA_PARENT_DEV_NAME
878882
IFLA_PERM_ADDRESS
879883
IFLA_PHYS_PORT_ID
880884
IFLA_PHYS_PORT_NAME
@@ -890,6 +894,8 @@ IFLA_QDISC
890894
IFLA_STATS
891895
IFLA_STATS64
892896
IFLA_TARGET_NETNSID
897+
IFLA_TSO_MAX_SEGS
898+
IFLA_TSO_MAX_SIZE
893899
IFLA_TXQLEN
894900
IFLA_UNSPEC
895901
IFLA_VFINFO_LIST

src/unix/linux_like/linux/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,6 +1721,12 @@ pub const IFLA_PROP_LIST: ::c_ushort = 52;
17211721
pub const IFLA_ALT_IFNAME: ::c_ushort = 53;
17221722
pub const IFLA_PERM_ADDRESS: ::c_ushort = 54;
17231723
pub const IFLA_PROTO_DOWN_REASON: ::c_ushort = 55;
1724+
pub const IFLA_PARENT_DEV_NAME: ::c_ushort = 56;
1725+
pub const IFLA_PARENT_DEV_BUS_NAME: ::c_ushort = 57;
1726+
pub const IFLA_GRO_MAX_SIZE: ::c_ushort = 58;
1727+
pub const IFLA_TSO_MAX_SIZE: ::c_ushort = 59;
1728+
pub const IFLA_TSO_MAX_SEGS: ::c_ushort = 60;
1729+
pub const IFLA_ALLMULTI: ::c_ushort = 61;
17241730

17251731
pub const IFLA_INFO_UNSPEC: ::c_ushort = 0;
17261732
pub const IFLA_INFO_KIND: ::c_ushort = 1;

0 commit comments

Comments
 (0)