From e2397d35247ef4fb9d31194500b9cc079ec3d1fc Mon Sep 17 00:00:00 2001 From: sam Date: Sun, 12 Dec 2004 04:32:44 +0000 Subject: always display the deftxkey for an 802.11 device if privacy is enabled --- sbin/ifconfig/ifieee80211.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sbin') diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index d7800d4..9c24eb3 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -1382,9 +1382,10 @@ ieee80211_status(int s, const struct rt_addrinfo *info __unused) ireq.i_type = IEEE80211_IOC_WEP; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_WEP_NOSUP) { - int firstkey; + int firstkey, wepmode; - switch (ireq.i_val) { + wepmode = ireq.i_val; + switch (wepmode) { case IEEE80211_WEP_OFF: LINE_CHECK("%cprivacy OFF", spacer); break; @@ -1396,7 +1397,7 @@ ieee80211_status(int s, const struct rt_addrinfo *info __unused) break; default: LINE_CHECK("%cprivacy UNKNOWN (0x%x)", - spacer, ireq.i_val); + spacer, wepmode); break; } @@ -1412,7 +1413,7 @@ ieee80211_status(int s, const struct rt_addrinfo *info __unused) } if (ireq.i_val != -1) LINE_CHECK("%cdeftxkey %d", spacer, ireq.i_val+1); - else if (verbose) + else if (wepmode != IEEE80211_WEP_OFF || verbose) LINE_CHECK("%cdeftxkey UNDEF", spacer); ireq.i_type = IEEE80211_IOC_NUMWEPKEYS; -- cgit v1.1