From aba559658b2f2d3f9f53f3f4e35899cd717579fb Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 23 Nov 2017 19:49:07 +0200 Subject: [PATCH] update --- src/net.c | 2 +- src/options.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/net.c b/src/net.c index 33dbfd4..b5acb99 100644 --- a/src/net.c +++ b/src/net.c @@ -731,7 +731,7 @@ get_wifi(char *str1, char *str2, uint8_t num) { memset(&ifmr, 0, sizeof(ifmr)); strlcpy(ifmr.ifm_name, ifa->ifa_name, IF_NAMESIZE); - if (0 != ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr)) { + if (0 != ioctl(fd, SIOCGIFMEDIA, (caddr_t)&ifmr)) { continue; } if (0 == (ifmr.ifm_active & IFM_IEEE80211)) { diff --git a/src/options.c b/src/options.c index 1c685da..b61406b 100644 --- a/src/options.c +++ b/src/options.c @@ -389,6 +389,11 @@ parse_opt(int key, char *arg, struct argp_state *state) { NEW_SWAPP_LABEL('F', char swapp_perc[VLA], swapp_perc, 4, FMT_SSD2, SSD_STR); NEW_NET_LABEL('j', char nic_info[VLA], nic_info, 7, FMT_KERN); + +#if defined(__OpenBSD__) + NEW_NET_LABEL('h', char wifiname[VLA], wifiname, 11, FMT_KERN); +#endif /* __OpenBSD__ */ + #endif /* __FreeBSD__ || __OpenBSD__ */ @@ -408,9 +413,6 @@ parse_opt(int key, char *arg, struct argp_state *state) { NEW_NET_LABEL('e', char link_speed[VLA], link_speed, 7, FMT_KERN); #endif /* __linux__ */ -#if defined(__OpenBSD__) - NEW_NET_LABEL('h', char wifiname[VLA], wifiname, 11, FMT_KERN); -#endif /* __OpenBSD__ */ case 'V': #if defined(HAVE_ALSA_ASOUNDLIB_H) || defined(HAVE_SYS_SOUNDCARD_H) || \ -- 2.11.0