From ee424b7351238024f8eb704aa2775b0b37876fb1 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Wed, 10 Jun 2020 18:59:46 +0000 Subject: [PATCH] [net80211] ok ok if_xname won't ever be NULL. Somewhere in net80211 if_xname is checked against NULL but it doesn't trigger a compiler warning, but this does. So DTRT for FreeBSD and the other if_xname derefences can be converted to this function at a later time. --- sys/net80211/ieee80211_freebsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index 69b6de43b41..8802c6fb41d 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1042,7 +1042,7 @@ wlan_iflladdr(void *arg __unused, struct ifnet *ifp) const char * ieee80211_get_vap_ifname(struct ieee80211vap *vap) { - if ((vap->iv_ifp == NULL) || (vap->iv_ifp->if_xname == NULL)) + if (vap->iv_ifp == NULL) return "(none)"; return vap->iv_ifp->if_xname; }