diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2022-04-29 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-04-29 08:00:00 +0000 |
| commit | 805e6c1ec0c068eeab1de80d4939f34b76133071 (patch) | |
| tree | b35854bf39c52d0ab2271a98b0215a5789f4cdc7 | |
| parent | 6d57d292203dbd52d43f3c9787b1ad2c39e50c24 (diff) | |
| download | strace-805e6c1ec0c068eeab1de80d4939f34b76133071.tar.gz | |
xlat: update BR_* constants
* src/xlat/rtnl_ifla_br_boolopts.in (BR_BOOLOPT_MST_ENABLE): New
constant introduced by Linux kernel commit v5.18-rc1~136^2~50^2~14.
* src/xlat/rtnl_ifla_br_boolopt_flags.in (1<<BR_BOOLOPT_MST_ENABLE):
Likewise.
* tests/nlattr_ifla_linkinfo.c (main): Update expected output.
* NEWS: Mention this.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/xlat/rtnl_ifla_br_boolopt_flags.in | 1 | ||||
| -rw-r--r-- | src/xlat/rtnl_ifla_br_boolopts.in | 1 | ||||
| -rw-r--r-- | tests/nlattr_ifla_linkinfo.c | 16 |
4 files changed, 12 insertions, 8 deletions
@@ -5,7 +5,7 @@ Noteworthy changes in release ?.?? (????-??-??) * Added an interface of raising des Strausses awareness. * Added --tips option to print strace tips, tricks, and tweaks at the end of the tracing session. - * Updated lists of BTRFS_*, IFA_*, IFLA_*, and MADV_* constants. + * Updated lists of BR_*, BTRFS_*, IFA_*, IFLA_*, and MADV_* constants. * Bug fixes diff --git a/src/xlat/rtnl_ifla_br_boolopt_flags.in b/src/xlat/rtnl_ifla_br_boolopt_flags.in index 2a6c4acfb..86720425c 100644 --- a/src/xlat/rtnl_ifla_br_boolopt_flags.in +++ b/src/xlat/rtnl_ifla_br_boolopt_flags.in @@ -1,3 +1,4 @@ #unconditional 1<<BR_BOOLOPT_NO_LL_LEARN 1<<BR_BOOLOPT_MCAST_VLAN_SNOOPING +1<<BR_BOOLOPT_MST_ENABLE diff --git a/src/xlat/rtnl_ifla_br_boolopts.in b/src/xlat/rtnl_ifla_br_boolopts.in index 093435920..a32080620 100644 --- a/src/xlat/rtnl_ifla_br_boolopts.in +++ b/src/xlat/rtnl_ifla_br_boolopts.in @@ -2,3 +2,4 @@ #value_indexed BR_BOOLOPT_NO_LL_LEARN 0 BR_BOOLOPT_MCAST_VLAN_SNOOPING 1 +BR_BOOLOPT_MST_ENABLE 2 diff --git a/tests/nlattr_ifla_linkinfo.c b/tests/nlattr_ifla_linkinfo.c index 0ca3e548a..2e763fd30 100644 --- a/tests/nlattr_ifla_linkinfo.c +++ b/tests/nlattr_ifla_linkinfo.c @@ -581,17 +581,19 @@ main(void) "\"\\x01\\x00\\x00\\x00\\x02\\x00\\x00\""), "{optval=1<<BR_BOOLOPT_NO_LL_LEARN" ", optmask=1<<BR_BOOLOPT_MCAST_VLAN_SNOOPING}" }, - { { .optval = 0xdeadfaec, .optmask = 0xbadc0dec }, - BE_LE("\"\\xde\\xad\\xfa\\xec\\xba\\xdc\\x0d\"", - "\"\\xec\\xfa\\xad\\xde\\xec\\x0d\\xdc\""), - "{optval=0xdeadfaec /* 1<<BR_BOOLOPT_??? */" - ", optmask=0xbadc0dec /* 1<<BR_BOOLOPT_??? */}" }, + { { .optval = 0xdeadfae8, .optmask = 0xbadc0de8 }, + BE_LE("\"\\xde\\xad\\xfa\\xe8\\xba\\xdc\\x0d\"", + "\"\\xe8\\xfa\\xad\\xde\\xe8\\x0d\\xdc\""), + "{optval=0xdeadfae8 /* 1<<BR_BOOLOPT_??? */" + ", optmask=0xbadc0de8 /* 1<<BR_BOOLOPT_??? */}" }, { { .optval = 0xfacebeef, .optmask = 0xfeedcafe }, BE_LE("\"\\xfa\\xce\\xbe\\xef\\xfe\\xed\\xca\"", "\"\\xef\\xbe\\xce\\xfa\\xfe\\xca\\xed\""), "{optval=1<<BR_BOOLOPT_NO_LL_LEARN" - "|1<<BR_BOOLOPT_MCAST_VLAN_SNOOPING|0xfacebeec" - ", optmask=1<<BR_BOOLOPT_MCAST_VLAN_SNOOPING|0xfeedcafc}" }, + "|1<<BR_BOOLOPT_MCAST_VLAN_SNOOPING" + "|1<<BR_BOOLOPT_MST_ENABLE|0xfacebee8" + ", optmask=1<<BR_BOOLOPT_MCAST_VLAN_SNOOPING" + "|1<<BR_BOOLOPT_MST_ENABLE|0xfeedcaf8}" }, }; for (size_t k = 0; k < ARRAY_SIZE(boolopts); k++) { TEST_NESTED_LINKINFO(fd, nlh0, IFLA_INFO_KIND, |