mFFeqOc3V XK+Hc4sIYzZ8KyW1umzu53LrAZON53SePnqpxLTNWX/TtzGDOjKGvuNDcqkV+juQi+wDDx 6HdE04P0ftTx2GQaS+C8pWgtb4GRMMS61kczHbmCL7frGbeE4NxdZFuSTNdU5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781621905; a=rsa-sha256; cv=none; b=eVUjf9lPSPZXTikvWQHXlcNZcHtXBETcdXN3jMNzQ38J3hx9w0CeIXJrKdHIiQu5nnc81t 2LaqOUPNPzXPkAkeM3ighNjqU6irfsxXbTa4yR0ttXTkaqzArwhLZt/w7cYssasiuFN7Cu TYjXfWiwyU3zcOCOycj3cOK16dwP1nnxz5E4KVxrjrJwSetmryyGKpnjTcfKZiGgbYi7PL Bq05ZpBl+dH2KZC52CsGqsUkgpcZMI33WQAMdLxV1xINtsfMf3+KIEuiX4ylbOuaisOc8j MTj8h1ZyyVMOM2LSkPsZdNEJZ+yXtLXGP1c9ktpffO0eiOVPB0TYWTCvpAygjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781621905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v7+pLm+V0bPSb73LlmeqyNhGgSaKRuuXn/dezb9Xv4k=; b=C+cf9yvvyQyLl3LTGA9tHPdvFWVT+b2Q5BjfNXbppunmeD0Wtlz5elAcw0RLo7h5TB4cDz DQPQXnavuqOGALS3j1hCKI1qLxzFQCyXS97hMZtWM50wR/2DQF1CPdG8R/wFRn/NIo7/yI sKtriGaRzsLty7XyMHSAaakXprJWFwFtV1OCgAYpJBuQrV3/jNSk/O2OCx3TjWrY80ib1/ L4WFeQSJ/KRVwUdnobja2aPW35d4e1AQC1oYk0qgGnwzBepHBsvM8IpfK6ISxyF2lXG+03 MNN4N7xPVt6T1USXBCNo7W/8P3kctivmLFgtbx6OCHEDmlySFOD0t9G7Vd/dLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfqqj5HmvzVFY for ; Tue, 16 Jun 2026 14:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 14:58:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: EN-WEU WU From: Adrian Chadd Subject: git: 9ef75e05ba91 - main - wtap: Remove bogus NULL check in wtap_transmit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ef75e05ba91b72c10a411fdd21fa5ca98efa0c9 Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 14:58:20 +0000 Message-Id: <6a31648c.3bd39.7b98d671@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef75e05ba91b72c10a411fdd21fa5ca98efa0c9 commit 9ef75e05ba91b72c10a411fdd21fa5ca98efa0c9 Author: EN-WEU WU AuthorDate: 2026-06-16 14:34:39 +0000 Commit: Adrian Chadd CommitDate: 2026-06-16 14:34:39 +0000 wtap: Remove bogus NULL check in wtap_transmit The node pointer is guaranteed to be non-NULL by the net80211 stack. The original check was also ineffective as it dereferenced ni->ni_vap before the NULL check. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D54547 --- sys/dev/wtap/if_wtap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 376b63e38f2b..51733a05bd93 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -601,12 +601,8 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct ieee80211vap *vap = ni->ni_vap; struct wtap_vap *avp = WTAP_VAP(vap); - if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); - }else{ - if (ieee80211_radiotap_active_vap(vap)) - ieee80211_radiotap_tx(vap, m); - } + if (ieee80211_radiotap_active_vap(vap)) + ieee80211_radiotap_tx(vap, m); if (m->m_flags & M_TXCB) ieee80211_process_callback(ni, m, 0); ieee80211_free_node(ni);