Merge branch 'master' into develop

2 files changed, 30 insertions, 7 deletions

diff --git a/src/class/net/net_device.c b/src/class/net/net_device.c
index 7bb11d57c..68520625a 100644
--- a/src/class/net/net_device.c
+++ b/src/class/net/net_device.c
@@ -63,7 +63,15 @@ typedef struct
 CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t received[CFG_TUD_NET_PACKET_PREFIX_LEN + CFG_TUD_NET_MTU + CFG_TUD_NET_PACKET_PREFIX_LEN];
 CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t transmitted[CFG_TUD_NET_PACKET_PREFIX_LEN + CFG_TUD_NET_MTU + CFG_TUD_NET_PACKET_PREFIX_LEN];
 
-#if CFG_TUD_NET == OPT_NET_RNDIS
+#if CFG_TUD_NET == OPT_NET_ECM
+  CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static tusb_control_request_t notify =
+  {
+    .bmRequestType = 0x21,
+    .bRequest = 0 /* NETWORK_CONNECTION */,
+    .wValue = 1 /* Connected */,
+    .wLength = 0,
+  };
+#elif CFG_TUD_NET == OPT_NET_RNDIS
   CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t rndis_buf[120];
 #endif
 
@@ -197,7 +205,15 @@ 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
+#if CFG_TUD_NET == OPT_NET_ECM
+  /* the only required CDC-ECM Management Element Request is SetEthernetPacketFilter */
+  if (0x43 /* SET_ETHERNET_PACKET_FILTER */ == request->bRequest)
+  {
+    tud_control_xfer(rhport, request, NULL, 0);
+    notify.wIndex = request->wIndex;
+    usbd_edpt_xfer(TUD_OPT_RHPORT, _netd_itf.ep_notif, (uint8_t *)&notify, sizeof(notify));
+  }
+#elif CFG_TUD_NET == OPT_NET_RNDIS
   if (request->bmRequestType_bit.direction == TUSB_DIR_IN)
   {
     rndis_generic_msg_t *rndis_msg = (rndis_generic_msg_t *)rndis_buf;
diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 4fd40c440..c61606f18 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -101,22 +101,29 @@ static bool _data_stage_xact(uint8_t rhport)
   return dcd_edpt_xfer(rhport, ep_addr, xact_len ? _usbd_ctrl_buf : NULL, xact_len);
 }
 
+// Transmit data to/from the control endpoint.
+// 
+// If the request's wLength is zero, a status packet is sent instead.
 bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, void* buffer, uint16_t len)
 {
   _ctrl_xfer.request       = (*request);
   _ctrl_xfer.buffer        = (uint8_t*) buffer;
-  _ctrl_xfer.total_xferred = 0;
+  _ctrl_xfer.total_xferred = 0U;
   _ctrl_xfer.data_len      = tu_min16(len, request->wLength);
-
-  if ( _ctrl_xfer.data_len )
+  
+  if (request->wLength > 0U)
   {
-    TU_ASSERT(buffer);
+    if(_ctrl_xfer.data_len > 0U)
+    {
+      TU_ASSERT(buffer);
+    }
 
     TU_LOG2("  XFER Endpoint: 0x%02X, Bytes: %d\r\n", request->bmRequestType_bit.direction ? EDPT_CTRL_IN : EDPT_CTRL_OUT, _ctrl_xfer.data_len);
 
     // Data stage
     TU_ASSERT( _data_stage_xact(rhport) );
-  }else
+  }
+  else
   {
     // Status stage
     TU_ASSERT( _status_stage_xact(rhport, request) );