shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-24 09:49:49 +03:00
Code Activity

net: initialize structs when declaring

Browse Source
This commit is contained in:
Tom Gundersen
2014-02-21 21:32:38 +01:00
parent 61f3af4fed
commit 6c0519c012
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/udev/net/ethtool-util.c
View File

@ -89,20 +89,19 @@ int ethtool_get_driver(int fd, const char *ifname, char **ret) {
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 ifreq ifr; struct ethtool_cmd ecmd = {
struct ethtool_cmd ecmd; .cmd = ETHTOOL_GSET
};
struct ifreq ifr = {
.ifr_data = (void*) &ecmd
};
bool need_update = false; bool need_update = false;
int r; int r;
if (speed == 0 && duplex == _DUP_INVALID) if (speed == 0 && duplex == _DUP_INVALID)
return 0; return 0;
zero(ecmd);
ecmd.cmd = ETHTOOL_GSET;
zero(ifr);
strscpy(ifr.ifr_name, IFNAMSIZ, ifname); strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
ifr.ifr_data = (void *)&ecmd;
r = ioctl(fd, SIOCETHTOOL, &ifr); r = ioctl(fd, SIOCETHTOOL, &ifr);
if (r < 0) if (r < 0)
@ -142,20 +141,19 @@ int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex dup
} }
int ethtool_set_wol(int fd, const char *ifname, WakeOnLan wol) { int ethtool_set_wol(int fd, const char *ifname, WakeOnLan wol) {
struct ifreq ifr; struct ethtool_wolinfo ecmd = {
struct ethtool_wolinfo ecmd; .cmd = ETHTOOL_GWOL
};
struct ifreq ifr = {
.ifr_data = (void*) &ecmd
};
bool need_update = false; bool need_update = false;
int r; int r;
if (wol == _WOL_INVALID) if (wol == _WOL_INVALID)
return 0; return 0;
zero(ecmd);
ecmd.cmd = ETHTOOL_GWOL;
zero(ifr);
strscpy(ifr.ifr_name, IFNAMSIZ, ifname); strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
ifr.ifr_data = (void *)&ecmd;
r = ioctl(fd, SIOCETHTOOL, &ifr); r = ioctl(fd, SIOCETHTOOL, &ifr);
if (r < 0) if (r < 0)