Author: hselasky
Date: Thu May 28 08:41:18 2020
New Revision: 361582
URL: https://svnweb.freebsd.org/changeset/base/361582

Log:
  Fix check for wMaxPacketSize in USB bluetooth driver,
  in case device is not FULL speed.
  
  MFC after:    3 days
  Sponsored by: Mellanox Technologies

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c    Thu May 28 08:38:25 
2020        (r361581)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c    Thu May 28 08:41:18 
2020        (r361582)
@@ -623,7 +623,7 @@ ubt_attach(device_t dev)
        struct usb_endpoint_descriptor  *ed;
        struct usb_interface_descriptor *id;
        struct usb_interface            *iface;
-       uint16_t                        wMaxPacketSize;
+       uint32_t                        wMaxPacketSize;
        uint8_t                         alt_index, i, j;
        uint8_t                         iface_index[2] = { 0, 1 };
 
@@ -713,9 +713,10 @@ ubt_attach(device_t dev)
                if ((ed->bDescriptorType == UDESC_ENDPOINT) &&
                    (ed->bLength >= sizeof(*ed)) &&
                    (i == 1)) {
-                       uint16_t temp;
+                       uint32_t temp;
 
-                       temp = UGETW(ed->wMaxPacketSize);
+                       temp = usbd_get_max_frame_length(
+                           ed, NULL, usbd_get_speed(uaa->device));
                        if (temp > wMaxPacketSize) {
                                wMaxPacketSize = temp;
                                alt_index = j;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to