Author: hselasky
Date: Mon Jun  8 09:30:43 2020
New Revision: 361915
URL: https://svnweb.freebsd.org/changeset/base/361915

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

Modified:
  stable/11/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- stable/11/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c       Mon Jun  8 
09:30:08 2020        (r361914)
+++ stable/11/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c       Mon Jun  8 
09:30:43 2020        (r361915)
@@ -540,7 +540,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 };
 
@@ -630,9 +630,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-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to