FROMLIST: USB: gadget: f_rndis: fix bitrate for SuperSpeed and above

Align the SuperSpeed Plus bitrate for f_rndis to match f_ncm's ncm_bitrate
defined by commit 1650113888 ("usb: gadget: f_ncm: add SuperSpeed descriptors
for CDC NCM").

Bug: 170925797
Link: https://lore.kernel.org/r/20201126180937.255892-1-gregkh@linuxfoundation.org
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: If5bfe9d4b266e1bf3a0016950219a57c7d0aedca
(cherry picked from commit 68caaaea9f259554680175a7f39374338179d7db)
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Will McVicker
2020-10-15 23:01:51 -07:00
committed by Greg Kroah-Hartman
parent 743b92ddc1
commit 974f1252bb

View File

@@ -87,8 +87,10 @@ static inline struct f_rndis *func_to_rndis(struct usb_function *f)
/* peak (theoretical) bulk transfer rate in bits-per-second */
static unsigned int bitrate(struct usb_gadget *g)
{
if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS)
return 4250000000U;
if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER)
return 13 * 1024 * 8 * 1000 * 8;
return 3750000000U;
else if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
return 13 * 512 * 8 * 1000 * 8;
else