From nobody Sat Feb 7 00:58:24 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 4f7CJ11M1dz6Qs0d for ; Sat, 07 Feb 2026 00:58:25 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ04Lfwz3LgB for ; Sat, 07 Feb 2026 00:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAR5TaEnmlupt+ZpmAy5wIHhqFy/O5YBLAWu5rKiUyY=; b=AiXnqA49SMT7jNY5feeLDz/yJpMJzrr9yrQfdSRVHmhvBc+LtOVsrjXSaKekrBdb/PUgLZ O6Bl8CKv9+4iW6l7FJ9Sm0NOCs90onEu+oIgbdvPtS2lqiaa3d+5Qzw1lE0nbRJoG5V1tj Hb1Xahc0r/6TM49bdGiJXF7iULCUjQPzhbZZ3W3+n+Luy8cAg+ouaeJlTe51uUc/OKIxnx PokJofhh6BCIZsGqvYehdK9KY5/X6JzlxItat26b9K0UBfSK2Dp5YqbcfreTc0fSozxWgT CthISKVGJnQ5Jnqxin5iyYlTCOYlQGjqcRb6W1mI43hnwYL7q0aIu9RQZTVbXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425904; a=rsa-sha256; cv=none; b=JN27IjpLK2Kq1Yk/uGbfzf/61d/BOzy8Sfaskjwnb/oNHysxlGaoouHCiNghNQnPXaPCdi u+6EeAbDZSDmqi/PgDoqwnxVkdZyzxpQF4UfK9rJ8cStSQOqNFPn+uCzdvr/aYPZEw+gaC 40bZKGNXxGQrWExDq9PalxBFlhGHEOEf6DyYa4eKmNPwuwEM6VcfzsdCY19qLdmq9VC57m g+DI19FlvEu9I5tnxiTzKuuq6N51d5pcat2M7zp8C6wlT1UgtcWa3gz6HQr542CQgelfLU GNRH3rRo/LN4cx52ziO9h0Pyx5BHxqHY0AT68ARy0F5GSRoAi/WlnOQq3zc5YQ== 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=1770425904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAR5TaEnmlupt+ZpmAy5wIHhqFy/O5YBLAWu5rKiUyY=; b=FxM2PW81OORN+fP6vzPC3Vxc7oGHISWH+hGVwB2Kri07a1JD9SW03SmVP14tpwGaWXX5Ee Lfp6D88W6xgXdxKZAN1csVlryx0AtBHEm5giKrpdZfHNnvoyfnAFIvk7zN5ZJ9kvQiKe1g 0eI4NR5YGgP9K3Jg0cypbj0yHkCXROtPZz1bjIbqk5jKi1PM0e6Q+4FWi36aZXcclGt+Qz dadnoQZCGON8zmKr9LFbDfVE1B1OrIZRah+vHVoFJ/n24acOkNpxp9+1EQYIA8rCkeQtCB BvH0qwo8p8AWVG90VWlxHDOUEQOP7fKpX8KiuteLJ18dbapVYhKqY1FPK0JXHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ02stQzgGp for ; Sat, 07 Feb 2026 00:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 642c8387647d - main - mt76: make USB compile 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 642c8387647daabc2505497cdafef4d3ce82bbf2 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:24 +0000 Message-Id: <69868e30.31b6b.4625207a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=642c8387647daabc2505497cdafef4d3ce82bbf2 commit 642c8387647daabc2505497cdafef4d3ce82bbf2 Author: Bjoern A. Zeeb AuthorDate: 2026-02-03 18:25:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:51 +0000 mt76: make USB compile This is the mt76-specific changes to make the USB driver targets for 7921 and 7925 compile. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/mt792x_usb.c | 3 +++ sys/contrib/dev/mediatek/mt76/usb.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/sys/contrib/dev/mediatek/mt76/mt792x_usb.c b/sys/contrib/dev/mediatek/mt76/mt792x_usb.c index 552808458138..05879ae232d2 100644 --- a/sys/contrib/dev/mediatek/mt76/mt792x_usb.c +++ b/sys/contrib/dev/mediatek/mt76/mt792x_usb.c @@ -7,6 +7,9 @@ #include #include #include +#if defined(__FreeBSD__) +#include +#endif #include "mt792x.h" #include "mt76_connac2_mac.h" diff --git a/sys/contrib/dev/mediatek/mt76/usb.c b/sys/contrib/dev/mediatek/mt76/usb.c index b0d04a465f35..e658334fe4e4 100644 --- a/sys/contrib/dev/mediatek/mt76/usb.c +++ b/sys/contrib/dev/mediatek/mt76/usb.c @@ -5,6 +5,8 @@ #if defined(__FreeBSD__) #define LINUXKPI_PARAM_PREFIX mt76_usb_ + +#include #endif #include @@ -474,7 +476,11 @@ mt76u_get_rx_entry_len(struct mt76_dev *dev, u8 *data, } static struct sk_buff * +#if defined(__linux__) mt76u_build_rx_skb(struct mt76_dev *dev, void *data, +#elif defined(__FreeBSD__) +mt76u_build_rx_skb(struct mt76_dev *dev, u8 *data, +#endif int len, int buf_size) { int head_room, drv_flags = dev->drv->drv_flags; @@ -495,7 +501,11 @@ mt76u_build_rx_skb(struct mt76_dev *dev, void *data, data += head_room + MT_SKB_HEAD_LEN; page = virt_to_head_page(data); skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, +#if defined(__linux__) page, data - page_address(page), +#elif defined(__FreeBSD__) + page, data - (u8 *)page_address(page), +#endif len - MT_SKB_HEAD_LEN, buf_size); return skb;