X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fnet%2Fethtool-util.c;h=c644f91d02d749b9e41f400ea411652a4390bf48;hp=4fad52b469f28c6ef3216ad726bec04dc6e9d586;hb=0a2c2294265d1d4552af3e7a92df0d4560deb818;hpb=5fde13d748749f0e06e2e6cdd15f0980a79ea82c diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c index 4fad52b46..c644f91d0 100644 --- a/src/udev/net/ethtool-util.c +++ b/src/udev/net/ethtool-util.c @@ -67,15 +67,16 @@ int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex dup { struct ifreq ifr; struct ethtool_cmd ecmd; - bool need_update; + bool need_update = false; int r; if (speed == 0 && duplex == _DUP_INVALID) return 0; - memset(&ecmd, 0x00, sizeof(struct ethtool_cmd)); + zero(ecmd); ecmd.cmd = ETHTOOL_GSET; - memset(&ifr, 0x00, sizeof(struct ifreq)); + + zero(ifr); strscpy(ifr.ifr_name, IFNAMSIZ, ifname); ifr.ifr_data = (void *)&ecmd; @@ -119,15 +120,16 @@ 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) { struct ifreq ifr; struct ethtool_wolinfo ecmd; - bool need_update; + bool need_update = false; int r; if (wol == _WOL_INVALID) return 0; - memset(&ecmd, 0x00, sizeof(struct ethtool_wolinfo)); + zero(ecmd); ecmd.cmd = ETHTOOL_GWOL; - memset(&ifr, 0x00, sizeof(struct ifreq)); + + zero(ifr); strscpy(ifr.ifr_name, IFNAMSIZ, ifname); ifr.ifr_data = (void *)&ecmd;