use the values for RNDIS over Ethernet as defined in http://www.usb.org/developers/defined_class (search for RDNIS): - baseclass: 0xef (miscellaneous) - subclass: 0x04 - protocol: 0x01 with this setings the file in Documentation/usb/linux.inf is obsolete. Signed-off-by: Heiko Schocher <hs@xxxxxxx> --- Cc: Felipe Balbi <balbi@xxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Cc: linux-usb@xxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Cc: Oliver Neukum <oliver@xxxxxxxxxxx> Cc: netdev@xxxxxxxxxxxxxxx Cc: linux-api@xxxxxxxxxxxxxxx Cc: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Cc: Macpaul Lin <macpaul@xxxxxxxxx> Tested with the "USB Compliance test suite which runs Windows", see: http://www.usb.org/developers/tools/usb20_tools/#usb20cv drivers/net/usb/cdc_ether.c | 6 +++--- drivers/usb/core/generic.c | 6 +++--- drivers/usb/gadget/function/f_rndis.c | 6 +++--- include/uapi/linux/usb/cdc.h | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 2a32d91..9c216c2 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -35,9 +35,9 @@ static int is_rndis(struct usb_interface_descriptor *desc) { - return (desc->bInterfaceClass == USB_CLASS_COMM && - desc->bInterfaceSubClass == 2 && - desc->bInterfaceProtocol == 0xff); + return (desc->bInterfaceClass == USB_CLASS_MISC && + desc->bInterfaceSubClass == USB_CDC_SUBCLASS_RNDIS && + desc->bInterfaceProtocol == USB_CDC_RNDIS_PROTO_ETH); } static int is_activesync(struct usb_interface_descriptor *desc) diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index 358ca8d..a2a4e05 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -28,9 +28,9 @@ static inline const char *plural(int n) static int is_rndis(struct usb_interface_descriptor *desc) { - return desc->bInterfaceClass == USB_CLASS_COMM - && desc->bInterfaceSubClass == 2 - && desc->bInterfaceProtocol == 0xff; + return desc->bInterfaceClass == USB_CLASS_MISC + && desc->bInterfaceSubClass == USB_CDC_SUBCLASS_RNDIS + && desc->bInterfaceProtocol == USB_CDC_RNDIS_PROTO_ETH; } static int is_activesync(struct usb_interface_descriptor *desc) diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c index ddb09dc..cc06046 100644 --- a/drivers/usb/gadget/function/f_rndis.c +++ b/drivers/usb/gadget/function/f_rndis.c @@ -117,9 +117,9 @@ static struct usb_interface_descriptor rndis_control_intf = { /* .bInterfaceNumber = DYNAMIC */ /* status endpoint is optional; this could be patched later */ .bNumEndpoints = 1, - .bInterfaceClass = USB_CLASS_COMM, - .bInterfaceSubClass = USB_CDC_SUBCLASS_ACM, - .bInterfaceProtocol = USB_CDC_ACM_PROTO_VENDOR, + .bInterfaceClass = USB_CLASS_MISC, + .bInterfaceSubClass = USB_CDC_SUBCLASS_RNDIS, + .bInterfaceProtocol = USB_CDC_RNDIS_PROTO_ETH, /* .iInterface = DYNAMIC */ }; diff --git a/include/uapi/linux/usb/cdc.h b/include/uapi/linux/usb/cdc.h index b6a9cdd..8e8fc85 100644 --- a/include/uapi/linux/usb/cdc.h +++ b/include/uapi/linux/usb/cdc.h @@ -12,6 +12,7 @@ #include <linux/types.h> #define USB_CDC_SUBCLASS_ACM 0x02 +#define USB_CDC_SUBCLASS_RNDIS 0x04 #define USB_CDC_SUBCLASS_ETHERNET 0x06 #define USB_CDC_SUBCLASS_WHCM 0x08 #define USB_CDC_SUBCLASS_DMM 0x09 @@ -31,6 +32,8 @@ #define USB_CDC_ACM_PROTO_AT_CDMA 6 #define USB_CDC_ACM_PROTO_VENDOR 0xff +#define USB_CDC_RNDIS_PROTO_ETH 1 + #define USB_CDC_PROTO_EEM 7 #define USB_CDC_NCM_PROTO_NTB 1 -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
