Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83292236 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

net: cdc_ncm: remove descriptor pointers 



header_desc was completely unused and union_desc was never used
outside cdc_ncm_bind_common.

Cc: Alexey Orishko <alexey.orishko@gmail.com>
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b5287a7

drivers/net/usb/cdc_ncm.c

+6 −6
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static const struct ethtool_ops cdc_ncm_ethtool_ops = { 


int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_altsetting)

{

	const struct usb_cdc_union_desc *union_desc = NULL;

	struct cdc_ncm_ctx *ctx;

	struct usb_driver *driver;

	u8 *buf;
@@ -406,16 +407,15 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ 


		switch (buf[2]) {

		case USB_CDC_UNION_TYPE:

			if (buf[0] < sizeof(*(ctx->union_desc)))

			if (buf[0] < sizeof(*union_desc))

				break;



			ctx->union_desc =

					(const struct usb_cdc_union_desc *)buf;

			union_desc = (const struct usb_cdc_union_desc *)buf;



			ctx->control = usb_ifnum_to_if(dev->udev,

					ctx->union_desc->bMasterInterface0);

						       union_desc->bMasterInterface0);

			ctx->data = usb_ifnum_to_if(dev->udev,

					ctx->union_desc->bSlaveInterface0);

						    union_desc->bSlaveInterface0);

			break;



		case USB_CDC_ETHERNET_TYPE:
@@ -458,7 +458,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ 
	}



	/* some buggy devices have an IAD but no CDC Union */

	if (!ctx->union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {

	if (!union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {

		ctx->control = intf;

		ctx->data = usb_ifnum_to_if(dev->udev, intf->cur_altsetting->desc.bInterfaceNumber + 1);

		dev_dbg(&intf->dev, "CDC Union missing - got slave from IAD\n");

include/linux/usb/cdc_ncm.h

+1 −3
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ struct cdc_ncm_ctx { 


	const struct usb_cdc_ncm_desc *func_desc;

	const struct usb_cdc_mbim_desc *mbim_desc;

	const struct usb_cdc_header_desc *header_desc;

	const struct usb_cdc_union_desc *union_desc;

	const struct usb_cdc_ether_desc *ether_desc;



	struct usb_interface *control;