From f8606bc54e61672f8f6da4a5141544e999ca2ca3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 2 Sep 2025 10:39:45 +0900 Subject: [PATCH] ethtool-util: fix comment The very initial implementation sets cmd with zero when the bitmap length does not match. But, it is fixed by https://github.com/torvalds/linux/commit/793cf87de9d1a62dc9079c3ec5fcc01cfc62fafb Fortunately, our code does not follow the outdated comment, but checks cmd field correctly. --- src/shared/ethtool-util.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index 8b437c5a83..a443686d87 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -661,13 +661,12 @@ static int get_link_settings(int fd, struct ifreq *ifr, union ethtool_link_usett assert(ifr); assert(ret); - /* The interaction user/kernel via the new API requires a small ETHTOOL_GLINKSETTINGS - handshake first to agree on the length of the link mode bitmaps. If kernel doesn't - agree with user, it returns the bitmap length it is expecting from user as a negative - length (and cmd field is 0). When kernel and user agree, kernel returns valid info in - all fields (ie. link mode length > 0 and cmd is ETHTOOL_GLINKSETTINGS). Based on - https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf - */ + /* The interaction user/kernel via the new API requires a small ETHTOOL_GLINKSETTINGS handshake first + * to agree on the length of the link mode bitmaps. If kernel doesn't agree with user, it returns the + * bitmap length it is expecting from user as a negative length. When kernel and user agree, kernel + * returns valid info in all fields (with bitmap length > 0). + * https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf + * https://github.com/torvalds/linux/commit/793cf87de9d1a62dc9079c3ec5fcc01cfc62fafb */ ifr->ifr_data = (void*) &ecmd;