The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=642c8387647daabc2505497cdafef4d3ce82bbf2
commit 642c8387647daabc2505497cdafef4d3ce82bbf2 Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2026-02-03 18:25:02 +0000 Commit: Bjoern A. Zeeb <[email protected]> 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 <linux/kernel.h> #include <linux/module.h> #include <linux/usb.h> +#if defined(__FreeBSD__) +#include <linux/delay.h> +#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 <linux/delay.h> #endif #include <linux/module.h> @@ -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;
