Page MenuHomeFreeBSD
Files F157677106

D56122.id174476.diff
No OneTemporary
Actions

D56122.id174476.diff
View Options

diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -436,13 +436,10 @@
{ USB_VPI(USB_VENDOR_INTEL2, 0x0025, 0) },
{ USB_VPI(USB_VENDOR_INTEL2, 0x0026, 0) },
{ USB_VPI(USB_VENDOR_INTEL2, 0x0029, 0) },
-
- /*
- * Some Intel controllers are not yet supported by ng_ubt_intel and
- * should be ignored.
- */
{ USB_VPI(USB_VENDOR_INTEL2, 0x0032, 0) },
{ USB_VPI(USB_VENDOR_INTEL2, 0x0033, 0) },
+ { USB_VPI(USB_VENDOR_INTEL2, 0x0035, 0) },
+ { USB_VPI(USB_VENDOR_INTEL2, 0x0036, 0) },
/* MediaTek MT7925 */
{ USB_VPI(USB_VENDOR_AZUREWAVE, 0x3602, 0) },
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
@@ -101,6 +101,8 @@
/* Intel Wireless 9260/9560 and successors */
{ USB_VPI(USB_VENDOR_INTEL2, 0x0032, UBT_INTEL_DEVICE_9260) },
{ USB_VPI(USB_VENDOR_INTEL2, 0x0033, UBT_INTEL_DEVICE_9260) },
+ { USB_VPI(USB_VENDOR_INTEL2, 0x0035, UBT_INTEL_DEVICE_9260) },
+ { USB_VPI(USB_VENDOR_INTEL2, 0x0036, UBT_INTEL_DEVICE_9260) },
};
/*
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8
@@ -48,8 +48,8 @@
.Pp
This utility will
.Em only
-work with Intel Wireless 7260/8260/9260 chip based Bluetooth USB devices
-and some of their successors.
+work with Intel Wireless 7260/8260/9260 and newer chip based Bluetooth
+USB devices, including AX and BE series wireless adapters.
The identification is currently based on USB vendor ID/product ID pair.
The vendor ID should be 0x8087
.Pq Dv USB_VENDOR_INTEL2
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
@@ -7,6 +7,6 @@
match "subsystem" "DEVICE";
match "type" "ATTACH";
match "vendor" "0x8087";
- match "product" "(0x07dc|0x0a2a|0x0aa7|0x0a2b|0x0aaa|0x0025|0x0026|0x0029|0x0032|0x0033)";
+ match "product" "(0x07dc|0x0a2a|0x0aa7|0x0a2b|0x0aaa|0x0025|0x0026|0x0029|0x0032|0x0033|0x0035|0x0036)";
action "/usr/sbin/iwmbtfw -d $cdev -f /usr/local/share/iwmbt-firmware";
};
diff --git a/usr.sbin/bluetooth/iwmbtfw/main.c b/usr.sbin/bluetooth/iwmbtfw/main.c
--- a/usr.sbin/bluetooth/iwmbtfw/main.c
+++ b/usr.sbin/bluetooth/iwmbtfw/main.c
@@ -81,6 +81,8 @@
/* Intel Wireless 9260/9560 and successors */
{ .vendor_id = 0x8087, .product_id = 0x0032, .device = IWMBT_DEVICE_9260 },
{ .vendor_id = 0x8087, .product_id = 0x0033, .device = IWMBT_DEVICE_9260 },
+ { .vendor_id = 0x8087, .product_id = 0x0035, .device = IWMBT_DEVICE_9260 },
+ { .vendor_id = 0x8087, .product_id = 0x0036, .device = IWMBT_DEVICE_9260 },
};
static enum iwmbt_device

File Metadata

Mime Type
text/plain
Expires
Mon, May 25, 12:03 AM (14 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33491041
Default Alt Text
D56122.id174476.diff (2 KB)

Event Timeline