usbnet: cdc-ncm: apply introduced usb command APIs (90b8b037) · Commits · jan.koester / Linux

drivers/net/usb/cdc_ncm.c

+31 −54

Original line number	Original line	Diff line number	Diff line
	@@ -82,16 +82,15 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
	u16 ntb_fmt_supported;		u16 ntb_fmt_supported;
	u32 min_dgram_size;		u32 min_dgram_size;
	u32 min_hdr_size;		u32 min_hdr_size;
			struct usbnet *dev = netdev_priv(ctx->netdev);

	iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber;		iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber;

	err = usb_control_msg(ctx->udev,		err = usbnet_read_cmd(dev, USB_CDC_GET_NTB_PARAMETERS,
	usb_rcvctrlpipe(ctx->udev, 0),
	USB_CDC_GET_NTB_PARAMETERS,
	USB_TYPE_CLASS \| USB_DIR_IN		USB_TYPE_CLASS \| USB_DIR_IN
	\|USB_RECIP_INTERFACE,		\|USB_RECIP_INTERFACE,
	0, iface_no, &ctx->ncm_parm,		0, iface_no, &ctx->ncm_parm,
	sizeof(ctx->ncm_parm), 10000);		sizeof(ctx->ncm_parm));
	if (err < 0) {		if (err < 0) {
	pr_debug("failed GET_NTB_PARAMETERS\n");		pr_debug("failed GET_NTB_PARAMETERS\n");
	return 1;		return 1;
	@@ -147,22 +146,12 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)

	/* inform device about NTB input size changes */		/* inform device about NTB input size changes */
	if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {		if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
	__le32 *dwNtbInMaxSize;		__le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);

	dwNtbInMaxSize = kzalloc(sizeof(*dwNtbInMaxSize), GFP_KERNEL);		err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_INPUT_SIZE,
	if (!dwNtbInMaxSize) {
	err = -ENOMEM;
	goto size_err;
	}
	*dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
	err = usb_control_msg(ctx->udev,
	usb_sndctrlpipe(ctx->udev, 0),
	USB_CDC_SET_NTB_INPUT_SIZE,
	USB_TYPE_CLASS \| USB_DIR_OUT		USB_TYPE_CLASS \| USB_DIR_OUT
	\| USB_RECIP_INTERFACE,		\| USB_RECIP_INTERFACE,
	0, iface_no, dwNtbInMaxSize, 4, 1000);		0, iface_no, &dwNtbInMaxSize, 4);
	kfree(dwNtbInMaxSize);
	size_err:
	if (err < 0)		if (err < 0)
	pr_debug("Setting NTB Input Size failed\n");		pr_debug("Setting NTB Input Size failed\n");
	}		}
	@@ -218,23 +207,22 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)

	/* set CRC Mode */		/* set CRC Mode */
	if (flags & USB_CDC_NCM_NCAP_CRC_MODE) {		if (flags & USB_CDC_NCM_NCAP_CRC_MODE) {
	err = usb_control_msg(ctx->udev, usb_sndctrlpipe(ctx->udev, 0),		err = usbnet_write_cmd(dev, USB_CDC_SET_CRC_MODE,
	USB_CDC_SET_CRC_MODE,
	USB_TYPE_CLASS \| USB_DIR_OUT		USB_TYPE_CLASS \| USB_DIR_OUT
	\| USB_RECIP_INTERFACE,		\| USB_RECIP_INTERFACE,
	USB_CDC_NCM_CRC_NOT_APPENDED,		USB_CDC_NCM_CRC_NOT_APPENDED,
	iface_no, NULL, 0, 1000);		iface_no, NULL, 0);
	if (err < 0)		if (err < 0)
	pr_debug("Setting CRC mode off failed\n");		pr_debug("Setting CRC mode off failed\n");
	}		}

	/* set NTB format, if both formats are supported */		/* set NTB format, if both formats are supported */
	if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) {		if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) {
	err = usb_control_msg(ctx->udev, usb_sndctrlpipe(ctx->udev, 0),		err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_FORMAT,
	USB_CDC_SET_NTB_FORMAT, USB_TYPE_CLASS		USB_TYPE_CLASS \| USB_DIR_OUT
	\| USB_DIR_OUT \| USB_RECIP_INTERFACE,		\| USB_RECIP_INTERFACE,
	USB_CDC_NCM_NTB16_FORMAT,		USB_CDC_NCM_NTB16_FORMAT,
	iface_no, NULL, 0, 1000);		iface_no, NULL, 0);
	if (err < 0)		if (err < 0)
	pr_debug("Setting NTB format to 16-bit failed\n");		pr_debug("Setting NTB format to 16-bit failed\n");
	}		}
	@@ -243,7 +231,7 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)

	/* set Max Datagram Size (MTU) */		/* set Max Datagram Size (MTU) */
	if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {		if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
	__le16 *max_datagram_size;		__le16 max_datagram_size;
	u16 eth_max_sz;		u16 eth_max_sz;
	if (ctx->ether_desc != NULL)		if (ctx->ether_desc != NULL)
	eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);		eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
	@@ -252,25 +240,16 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
	else		else
	goto max_dgram_err;		goto max_dgram_err;

	max_datagram_size = kzalloc(sizeof(*max_datagram_size),		err = usbnet_read_cmd(dev, USB_CDC_GET_MAX_DATAGRAM_SIZE,
	GFP_KERNEL);
	if (!max_datagram_size) {
	err = -ENOMEM;
	goto max_dgram_err;
	}

	err = usb_control_msg(ctx->udev, usb_rcvctrlpipe(ctx->udev, 0),
	USB_CDC_GET_MAX_DATAGRAM_SIZE,
	USB_TYPE_CLASS \| USB_DIR_IN		USB_TYPE_CLASS \| USB_DIR_IN
	\| USB_RECIP_INTERFACE,		\| USB_RECIP_INTERFACE,
	0, iface_no, max_datagram_size,		0, iface_no, &max_datagram_size, 2);
	2, 1000);
	if (err < 0) {		if (err < 0) {
	pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",		pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
	min_dgram_size);		min_dgram_size);
	} else {		} else {
	ctx->max_datagram_size =		ctx->max_datagram_size =
	le16_to_cpu(*max_datagram_size);		le16_to_cpu(max_datagram_size);
	/* Check Eth descriptor value */		/* Check Eth descriptor value */
	if (ctx->max_datagram_size > eth_max_sz)		if (ctx->max_datagram_size > eth_max_sz)
	ctx->max_datagram_size = eth_max_sz;		ctx->max_datagram_size = eth_max_sz;
	@@ -283,20 +262,18 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)

	/* if value changed, update device */		/* if value changed, update device */
	if (ctx->max_datagram_size !=		if (ctx->max_datagram_size !=
	le16_to_cpu(*max_datagram_size)) {		le16_to_cpu(max_datagram_size)) {
	err = usb_control_msg(ctx->udev,		err = usbnet_write_cmd(dev,
	usb_sndctrlpipe(ctx->udev, 0),
	USB_CDC_SET_MAX_DATAGRAM_SIZE,		USB_CDC_SET_MAX_DATAGRAM_SIZE,
	USB_TYPE_CLASS \| USB_DIR_OUT		USB_TYPE_CLASS \| USB_DIR_OUT
	\| USB_RECIP_INTERFACE,		\| USB_RECIP_INTERFACE,
	0,		0,
	iface_no, max_datagram_size,		iface_no, &max_datagram_size,
	2, 1000);		2);
	if (err < 0)		if (err < 0)
	pr_debug("SET_MAX_DGRAM_SIZE failed\n");		pr_debug("SET_MAX_DGRAM_SIZE failed\n");
	}		}
	}		}
	kfree(max_datagram_size);
	}		}

	max_dgram_err:		max_dgram_err: