Skip to content

ethtool: better handle portability #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2016
Merged

ethtool: better handle portability #1679

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions opal/util/ethtool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright (c) 2016 Karol Mroz. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -33,18 +34,6 @@
#include "opal/util/ethtool.h"
#include "opal/util/if.h"

#if ! HAVE_DECL_ETHTOOL_CMD_SPEED
static inline unsigned int
ethtool_cmd_speed(const struct ethtool_cmd *ep)
{
#ifdef HAVE_STRUCT_ETHTOOL_CMD_SPEED_HI
return (ep->speed_hi << 16) | ep->speed;
#else
return ep->speed;
#endif
}
#endif

/*
* Obtain an appropriate bandwidth for the interface if_name. On Linux, we
* get this via an ioctl(). Elsewhere or in the error case, we return the
Expand Down Expand Up @@ -75,15 +64,18 @@ opal_ethtool_get_speed (const char *if_name)
goto out;
}

speed = ethtool_cmd_speed(&edata);
#ifdef HAVE_STRUCT_ETHTOOL_CMD_SPEED_HI
speed = (edata.speed_hi << 16) | edata.speed;
#else
speed = edata.speed;
#endif
if (UINT_MAX == speed) {
speed = 0;
}

out:
close(sockfd);
return speed;
#else
return speed;
#endif

return speed;
}