From nobody Tue Jun 16 14:58:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gfqqf13rQz6hJZH for ; Tue, 16 Jun 2026 14:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfqqd6BDLz40Zq for ; Tue, 16 Jun 2026 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781621901; 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=aBn6D8c/jymxkPQcJEomWWSGndJmdsO4vWKhjhXk5uM=; b=vasecO3c5U4CZsZuz73yTirN9/XaT7Bj7qEtCNgPU14TepmyKhPjeQ3W+2K9ir91hbxBMH dTHUca4rK2nDrxcaFyt2L7ptGoOg/WqGse4sbT5wbUpO+EMWxIfSPNsN8LTyv4mOSLeydB tTttkCexLqvjX+nd5wry7FJH7VCOuBOGXFxRre+sST9ebEkGpD+AlMP17mbBmxeg3Ttul2 ybXw1BWuRvGghSfvSoAHD7ig8/1yaS8vEfJmbMsD6MtNmyk6v8fNQQfr3KZY1WFhohIWoi x4rl0qxWt0C8WRJ41+ubjObgfPfpEshxJ5Va8FFDZ8w2mmGiWeavreq09J8HIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781621901; a=rsa-sha256; cv=none; b=XSlgh/jMnnG/P8glEn6FZ2hQ2Kq7Q2mKWkPJESuGp4/MlnuAcxXpHXFuR3aXsnq14+3J5C +0F4CHtbLo4zwhQx66Nx3MB4ZUFZu2B4NDKMmXk/Hi0dtfL6Y5olIdIbsl30yxL3lRz1Hd r1r5hofIIzrAjTfqWnmVhC1Wc6FfM9CDz/hXSpi+bV/AoEavntg9dUgd//INX0y48DNLU3 kJRDfhUwmv7upOjQKro0Et9vMOgKeuV/QcvOF7bSJdrJbzrjI/g1jTe5JWItujIHifaLDM 2Zd6Dvcc8f8AW8zbPiwmSiGXstC9dluC7fff/CdDz2FOFleD1sg6gkZu+5rVyQ== 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=1781621901; 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=aBn6D8c/jymxkPQcJEomWWSGndJmdsO4vWKhjhXk5uM=; b=NkMZyYpjyjEuM1vQAo7qOdCL/56GXoXRZqCzCD712YWndpgOzZZ1KGa9O9weXGfl5nnr+c NSIZ5ydTikVVy6tjL4sCuwFZa509oalJxDG3FhmraoEpKqxruVAAzhIRKIxwYnUoT9ydow e73Vr8VrF7cSvnYtyF4nkndXvfVsEwwp7HSw5TSgRK42h0+uWAYx0hta50hzySWpeTibrF YfdYPTIfTGF5vjiZAeFQJ36AkDkDtv++qsEViai16LkLs4x6reAXT5CWrAyPVFqtIKyNq3 DA6aplD95anUTadeCMQIX1LQ6wOtJRYLXt+4v/XsT3/0J+zK8GoRqvFmCk0JKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfqqd4mbbzVrd for ; Tue, 16 Jun 2026 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 14:58:21 +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: d4de0a69a92e - main - wtap(4): Implement STA/HostAP mode and support WPA/WPA2 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: d4de0a69a92e560c77df83d7b342566ce353792c Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 14:58:21 +0000 Message-Id: <6a31648d.3ce81.3cccde8a@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=d4de0a69a92e560c77df83d7b342566ce353792c commit d4de0a69a92e560c77df83d7b342566ce353792c Author: EN-WEU WU AuthorDate: 2026-06-16 14:35:20 +0000 Commit: Adrian Chadd CommitDate: 2026-06-16 14:35:20 +0000 wtap(4): Implement STA/HostAP mode and support WPA/WPA2 Below is the commit message: ``` Wtap originally only supported mesh/ad-hoc mode, and cannot be combined with wpa_supplicant(8) and hostapd(8) since it's unaware of encryption/decryption. This commit adds support for hostap and sta mode with WPA/WPA2, thus wtap(4) can now be used with hostapd(8) and wpa_supplicant(8). ``` Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D36243 --- sys/dev/wtap/if_wtap.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 51733a05bd93..d22b79a20dc4 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -297,6 +297,7 @@ wtap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) switch (vap->iv_opmode) { case IEEE80211_M_IBSS: case IEEE80211_M_MBSS: + case IEEE80211_M_HOSTAP: /* * Stop any previous beacon callout. This may be * necessary, for example, when an ibss merge @@ -600,6 +601,16 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) (struct ieee80211_node *) m->m_pkthdr.rcvif; struct ieee80211vap *vap = ni->ni_vap; struct wtap_vap *avp = WTAP_VAP(vap); + struct ieee80211_key *k; + struct ieee80211_frame *wh; + + wh = mtod(m, struct ieee80211_frame *); + + if (IEEE80211_IS_PROTECTED(wh)) { + k = ieee80211_crypto_encap(ni, m); + if (k == NULL) + return (ENOBUFS); + } if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); @@ -652,7 +663,18 @@ wtap_attach(struct wtap_softc *sc, const uint8_t *macaddr) ic->ic_name = sc->name; ic->ic_phytype = IEEE80211_T_DS; ic->ic_opmode = IEEE80211_M_MBSS; - ic->ic_caps = IEEE80211_C_MBSS | IEEE80211_C_IBSS; + ic->ic_caps = + IEEE80211_C_MBSS /* mesh point link mode */ + | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ + | IEEE80211_C_STA /* station mode */ + | IEEE80211_C_HOSTAP /* hostap mode */ + | IEEE80211_C_WPA; /* capable of WPA1+WPA2 */ + + ic->ic_cryptocaps = + IEEE80211_CRYPTO_WEP + | IEEE80211_CRYPTO_AES_CCM + | IEEE80211_CRYPTO_TKIP + | IEEE80211_CRYPTO_TKIPMIC; ic->ic_max_keyix = 128; /* A value read from Atheros ATH_KEYMAX */