back out last change
This commit is contained in:
parent
4cf7b4ed65
commit
372c09119d
|
@ -467,8 +467,7 @@ typedef struct {
|
||||||
netmask,
|
netmask,
|
||||||
flags,
|
flags,
|
||||||
mtu,
|
mtu,
|
||||||
metric,
|
metric;
|
||||||
speed;
|
|
||||||
} sigar_net_interface_config_t;
|
} sigar_net_interface_config_t;
|
||||||
|
|
||||||
SIGAR_DECLARE(int)
|
SIGAR_DECLARE(int)
|
||||||
|
|
|
@ -1756,7 +1756,6 @@ int sigar_net_interface_config_get(sigar_t *sigar, const char *name,
|
||||||
ifm = iter.data.ifm;
|
ifm = iter.data.ifm;
|
||||||
|
|
||||||
SIGAR_SSTRCPY(ifconfig->name, name);
|
SIGAR_SSTRCPY(ifconfig->name, name);
|
||||||
ifconfig->speed = SIGAR_FIELD_NOTIMPL;
|
|
||||||
|
|
||||||
sdl = (struct sockaddr_dl *)(ifm + 1);
|
sdl = (struct sockaddr_dl *)(ifm + 1);
|
||||||
sigar_hwaddr_format(ifconfig->hwaddr,
|
sigar_hwaddr_format(ifconfig->hwaddr,
|
||||||
|
|
|
@ -1981,7 +1981,6 @@ int sigar_get_ifentry_config(sigar_t *sigar,
|
||||||
}
|
}
|
||||||
|
|
||||||
ifconfig->mtu = ifr->dwMtu;
|
ifconfig->mtu = ifr->dwMtu;
|
||||||
ifconfig->speed = ifr->dwSpeed;
|
|
||||||
|
|
||||||
sigar_hwaddr_format(ifconfig->hwaddr,
|
sigar_hwaddr_format(ifconfig->hwaddr,
|
||||||
ifr->bPhysAddr);
|
ifr->bPhysAddr);
|
||||||
|
|
|
@ -1206,7 +1206,6 @@ int sigar_net_interface_config_get(sigar_t *sigar, const char *name,
|
||||||
|
|
||||||
SIGAR_SSTRCPY(ifconfig->name, name);
|
SIGAR_SSTRCPY(ifconfig->name, name);
|
||||||
SIGAR_SSTRCPY(ifr.ifr_name, name);
|
SIGAR_SSTRCPY(ifr.ifr_name, name);
|
||||||
ifconfig->speed = SIGAR_FIELD_NOTIMPL;
|
|
||||||
|
|
||||||
#define ifr_s_addr(ifr) \
|
#define ifr_s_addr(ifr) \
|
||||||
((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr
|
((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr
|
||||||
|
|
|
@ -255,8 +255,6 @@ sigar_net_interface_config_get(sigar_t *sigar,
|
||||||
*/
|
*/
|
||||||
SIGAR_SSTRCPY(ifconfig->description,
|
SIGAR_SSTRCPY(ifconfig->description,
|
||||||
ifconfig->name);
|
ifconfig->name);
|
||||||
|
|
||||||
ifconfig->speed = SIGAR_FIELD_NOTIMPL;
|
|
||||||
|
|
||||||
hwaddr_lookup(sigar, ifconfig, i);
|
hwaddr_lookup(sigar, ifconfig, i);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue