summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/cdc_ncm.c
diff options
context:
space:
mode:
authorBjørn Mork2013-11-01 11:16:40 +0100
committerDavid S. Miller2013-11-02 07:02:01 +0100
commit3e515665a76ad8f60a1c05968cc6a5b2f2701171 (patch)
tree85515dd56a639083655fa3702d64d2c856ccb881 /drivers/net/usb/cdc_ncm.c
parentnet: cdc_ncm: add include protection to cdc_ncm.h (diff)
downloadkernel-qcow2-linux-3e515665a76ad8f60a1c05968cc6a5b2f2701171.tar.gz
kernel-qcow2-linux-3e515665a76ad8f60a1c05968cc6a5b2f2701171.tar.xz
kernel-qcow2-linux-3e515665a76ad8f60a1c05968cc6a5b2f2701171.zip
net: cdc_ncm: remove redundant "intf" field
This is always a duplicate of the "control" field. It causes confusion wrt intf_data updates and cleanups. Cc: Alexey Orishko <alexey.orishko@gmail.com> Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/cdc_ncm.c')
-rw-r--r--drivers/net/usb/cdc_ncm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 38566bffca98..bfab8796730f 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -382,7 +382,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
len = intf->cur_altsetting->extralen;
ctx->udev = dev->udev;
- ctx->intf = intf;
/* parse through descriptors associated with control interface */
while ((len > 0) && (buf[0] > 2) && (buf[0] <= len)) {
@@ -489,7 +488,6 @@ advance:
usb_set_intfdata(ctx->data, dev);
usb_set_intfdata(ctx->control, dev);
- usb_set_intfdata(ctx->intf, dev);
if (ctx->ether_desc) {
temp = usbnet_get_ethernet_addr(dev, ctx->ether_desc->iMACAddress);
@@ -562,7 +560,7 @@ void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf)
ctx->control = NULL;
}
- usb_set_intfdata(ctx->intf, NULL);
+ usb_set_intfdata(intf, NULL);
cdc_ncm_free(ctx);
}
EXPORT_SYMBOL_GPL(cdc_ncm_unbind);