Skip to content

Commit 5ec1eed

Browse files
committed
Merge pull request open-mpi#1682 from ggouaillardet/topic/fix-ethtool-again
opal/util/ethtool: use system ethtool_cmd_speed when available
2 parents cbbdce0 + a01a548 commit 5ec1eed

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

opal/util/ethtool.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ opal_ethtool_get_speed (const char *if_name)
6464
goto out;
6565
}
6666

67-
#ifdef HAVE_STRUCT_ETHTOOL_CMD_SPEED_HI
67+
#if HAVE_DECL_ETHTOOL_CMD_SPEED
68+
speed = ethtool_cmd_speed(&edata);
69+
#elif defined(HAVE_STRUCT_ETHTOOL_CMD_SPEED_HI)
6870
speed = (edata.speed_hi << 16) | edata.speed;
6971
#else
7072
speed = edata.speed;

0 commit comments

Comments
 (0)