chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: net_setup_link - open ethtool and rtnl connections lazily
[elogind.git]
/
src
/
udev
/
net
/
ethtool-util.c
diff --git
a/src/udev/net/ethtool-util.c
b/src/udev/net/ethtool-util.c
index 3ec245ecabc96b14b3e9582de3d61998653f109d..54cb928091d85a245407a37994629c898fc48fd8 100644
(file)
--- a/
src/udev/net/ethtool-util.c
+++ b/
src/udev/net/ethtool-util.c
@@
-63,7
+63,7
@@
int ethtool_connect(int *ret) {
return 0;
}
return 0;
}
-int ethtool_get_driver(int fd, const char *ifname, char **ret) {
+int ethtool_get_driver(int
*
fd, const char *ifname, char **ret) {
struct ethtool_drvinfo ecmd = {
.cmd = ETHTOOL_GDRVINFO
};
struct ethtool_drvinfo ecmd = {
.cmd = ETHTOOL_GDRVINFO
};
@@
-73,9
+73,17
@@
int ethtool_get_driver(int fd, const char *ifname, char **ret) {
char *d;
int r;
char *d;
int r;
+ if (*fd < 0) {
+ r = ethtool_connect(fd);
+ if (r < 0) {
+ log_warning("link_config: could not connect to ethtool: %s", strerror(-r));
+ return r;
+ }
+ }
+
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
- r = ioctl(fd, SIOCETHTOOL, &ifr);
+ r = ioctl(
*
fd, SIOCETHTOOL, &ifr);
if (r < 0)
return -errno;
if (r < 0)
return -errno;
@@
-87,7
+95,7
@@
int ethtool_get_driver(int fd, const char *ifname, char **ret) {
return 0;
}
return 0;
}
-int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex duplex)
+int ethtool_set_speed(int
*
fd, const char *ifname, unsigned int speed, Duplex duplex)
{
struct ethtool_cmd ecmd = {
.cmd = ETHTOOL_GSET
{
struct ethtool_cmd ecmd = {
.cmd = ETHTOOL_GSET
@@
-101,9
+109,17
@@
int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex dup
if (speed == 0 && duplex == _DUP_INVALID)
return 0;
if (speed == 0 && duplex == _DUP_INVALID)
return 0;
+ if (*fd < 0) {
+ r = ethtool_connect(fd);
+ if (r < 0) {
+ log_warning("link_config: could not connect to ethtool: %s", strerror(-r));
+ return r;
+ }
+ }
+
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
- r = ioctl(fd, SIOCETHTOOL, &ifr);
+ r = ioctl(
*
fd, SIOCETHTOOL, &ifr);
if (r < 0)
return -errno;
if (r < 0)
return -errno;
@@
-132,7
+148,7
@@
int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex dup
if (need_update) {
ecmd.cmd = ETHTOOL_SSET;
if (need_update) {
ecmd.cmd = ETHTOOL_SSET;
- r = ioctl(fd, SIOCETHTOOL, &ifr);
+ r = ioctl(
*
fd, SIOCETHTOOL, &ifr);
if (r < 0)
return -errno;
}
if (r < 0)
return -errno;
}
@@
-140,7
+156,7
@@
int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex dup
return 0;
}
return 0;
}
-int ethtool_set_wol(int fd, const char *ifname, WakeOnLan wol) {
+int ethtool_set_wol(int
*
fd, const char *ifname, WakeOnLan wol) {
struct ethtool_wolinfo ecmd = {
.cmd = ETHTOOL_GWOL
};
struct ethtool_wolinfo ecmd = {
.cmd = ETHTOOL_GWOL
};
@@
-153,9
+169,17
@@
int ethtool_set_wol(int fd, const char *ifname, WakeOnLan wol) {
if (wol == _WOL_INVALID)
return 0;
if (wol == _WOL_INVALID)
return 0;
+ if (*fd < 0) {
+ r = ethtool_connect(fd);
+ if (r < 0) {
+ log_warning("link_config: could not connect to ethtool: %s", strerror(-r));
+ return r;
+ }
+ }
+
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
- r = ioctl(fd, SIOCETHTOOL, &ifr);
+ r = ioctl(
*
fd, SIOCETHTOOL, &ifr);
if (r < 0)
return -errno;
if (r < 0)
return -errno;
@@
-185,7
+209,7
@@
int ethtool_set_wol(int fd, const char *ifname, WakeOnLan wol) {
if (need_update) {
ecmd.cmd = ETHTOOL_SWOL;
if (need_update) {
ecmd.cmd = ETHTOOL_SWOL;
- r = ioctl(fd, SIOCETHTOOL, &ifr);
+ r = ioctl(
*
fd, SIOCETHTOOL, &ifr);
if (r < 0)
return -errno;
}
if (r < 0)
return -errno;
}