Skip to content

Commit 08b8ef5

Browse files
committed
x/sys/unix: add missing ETHTOOL_FLAG_ constants
Some constants were removed in CL 600516 that included changes for the Linux kernel 6.10. This kernel version moved C defines to an enum ethtool_header_flags that was not picked up by the mkall.sh script. For enums, there is a perl script that needs to be run manually, and the output must be added by hand to the list of constants in unix/linux/types.go. Fixes golang/go#68761
1 parent 4c7077e commit 08b8ef5

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

unix/linux/types.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -3551,8 +3551,8 @@ const (
35513551

35523552
// ethtool and its netlink interface, generated using:
35533553
//
3554-
// perl -nlE '/^\s*(ETHTOOL_\w+)/ && say "$1 = C.$1"' ethtool.h
3555-
// perl -nlE '/^\s*(ETHTOOL_\w+)/ && say "$1 = C.$1"' ethtool_netlink.h
3554+
// perl -nlE '/^\s*(ETHTOOL_\w+)/ && say "$1 = C.$1"' /usr/include/linux/ethtool.h
3555+
// perl -nlE '/^\s*(ETHTOOL_\w+)/ && say "$1 = C.$1"' /usr/include/linux/ethtool_netlink.h
35563556
//
35573557
// Note that a couple of constants produced by this command will be duplicated
35583558
// by mkerrors.sh, so some manual pruning was necessary.
@@ -3787,6 +3787,9 @@ const (
37873787
ETHTOOL_MSG_PSE_GET_REPLY = C.ETHTOOL_MSG_PSE_GET_REPLY
37883788
ETHTOOL_MSG_RSS_GET_REPLY = C.ETHTOOL_MSG_RSS_GET_REPLY
37893789
ETHTOOL_MSG_KERNEL_MAX = C.ETHTOOL_MSG_KERNEL_MAX
3790+
ETHTOOL_FLAG_COMPACT_BITSETS = C.ETHTOOL_FLAG_COMPACT_BITSETS
3791+
ETHTOOL_FLAG_OMIT_REPLY = C.ETHTOOL_FLAG_OMIT_REPLY
3792+
ETHTOOL_FLAG_STATS = C.ETHTOOL_FLAG_STATS
37903793
ETHTOOL_A_HEADER_UNSPEC = C.ETHTOOL_A_HEADER_UNSPEC
37913794
ETHTOOL_A_HEADER_DEV_INDEX = C.ETHTOOL_A_HEADER_DEV_INDEX
37923795
ETHTOOL_A_HEADER_DEV_NAME = C.ETHTOOL_A_HEADER_DEV_NAME

unix/ztypes_linux.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)