summaryrefslogtreecommitdiff
path: root/src/class/net
diff options
context:
space:
mode:
authorPeter Lawrence <[email protected]>2020-03-15 16:05:45 -0500
committerPeter Lawrence <[email protected]>2020-03-15 16:05:45 -0500
commit5e8ff1f7c2887abb5459b0d9d6812e2da437d4d0 (patch)
tree71d63bfbbd0d925f2c274f1e9124b113f8910b79 /src/class/net
parentd74facfd0aede63da35c067ae8b8f3e4ed29ac6f (diff)
usb RNDIS revision on @pigrew suggestions
Diffstat (limited to 'src/class/net')
-rw-r--r--src/class/net/net_device.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/class/net/net_device.c b/src/class/net/net_device.c
index d0d32e909..7bb11d57c 100644
--- a/src/class/net/net_device.c
+++ b/src/class/net/net_device.c
@@ -198,7 +198,17 @@ bool netd_control_request(uint8_t rhport, tusb_control_request_t const * request
TU_VERIFY (_netd_itf.itf_num == request->wIndex);
#if CFG_TUD_NET == OPT_NET_RNDIS
- tud_control_xfer(rhport, request, rndis_buf, sizeof(rndis_buf));
+ if (request->bmRequestType_bit.direction == TUSB_DIR_IN)
+ {
+ rndis_generic_msg_t *rndis_msg = (rndis_generic_msg_t *)rndis_buf;
+ uint32_t msglen = tu_le32toh(rndis_msg->MessageLength);
+ TU_ASSERT(msglen <= sizeof(rndis_buf));
+ tud_control_xfer(rhport, request, rndis_buf, msglen);
+ }
+ else
+ {
+ tud_control_xfer(rhport, request, rndis_buf, sizeof(rndis_buf));
+ }
#else
(void)rhport;
#endif