Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
gadget
/
function
/
f_ncm.c
diff --git
a/kernel/drivers/usb/gadget/function/f_ncm.c
b/kernel/drivers/usb/gadget/function/f_ncm.c
index
bdcda9f
..
7ad798a
100644
(file)
--- a/
kernel/drivers/usb/gadget/function/f_ncm.c
+++ b/
kernel/drivers/usb/gadget/function/f_ncm.c
@@
-586,7
+586,7
@@
static void ncm_ep0out_complete(struct usb_ep *ep, struct usb_request *req)
unsigned in_size;
struct usb_function *f = req->context;
struct f_ncm *ncm = func_to_ncm(f);
unsigned in_size;
struct usb_function *f = req->context;
struct f_ncm *ncm = func_to_ncm(f);
- struct usb_composite_dev *cdev =
ep->driver_data
;
+ struct usb_composite_dev *cdev =
f->config->cdev
;
req->context = NULL;
if (req->status || req->actual != req->length) {
req->context = NULL;
if (req->status || req->actual != req->length) {
@@
-803,10
+803,8
@@
static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
if (alt != 0)
goto fail;
if (alt != 0)
goto fail;
- if (ncm->notify->driver_data) {
- DBG(cdev, "reset ncm control %d\n", intf);
- usb_ep_disable(ncm->notify);
- }
+ DBG(cdev, "reset ncm control %d\n", intf);
+ usb_ep_disable(ncm->notify);
if (!(ncm->notify->desc)) {
DBG(cdev, "init ncm ctrl %d\n", intf);
if (!(ncm->notify->desc)) {
DBG(cdev, "init ncm ctrl %d\n", intf);
@@
-814,14
+812,13
@@
static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
goto fail;
}
usb_ep_enable(ncm->notify);
goto fail;
}
usb_ep_enable(ncm->notify);
- ncm->notify->driver_data = ncm;
/* Data interface has two altsettings, 0 and 1 */
} else if (intf == ncm->data_id) {
if (alt > 1)
goto fail;
/* Data interface has two altsettings, 0 and 1 */
} else if (intf == ncm->data_id) {
if (alt > 1)
goto fail;
- if (ncm->port.in_ep->
driver_data
) {
+ if (ncm->port.in_ep->
enabled
) {
DBG(cdev, "reset ncm\n");
ncm->timer_stopping = true;
ncm->netdev = NULL;
DBG(cdev, "reset ncm\n");
ncm->timer_stopping = true;
ncm->netdev = NULL;
@@
-853,9
+850,8
@@
static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
/* Enable zlps by default for NCM conformance;
* override for musb_hdrc (avoids txdma ovhead)
*/
/* Enable zlps by default for NCM conformance;
* override for musb_hdrc (avoids txdma ovhead)
*/
- ncm->port.is_zlp_ok = !(
- gadget_is_musbhdrc(cdev->gadget)
- );
+ ncm->port.is_zlp_ok =
+ gadget_is_zlp_supported(cdev->gadget);
ncm->port.cdc_filter = DEFAULT_FILTER;
DBG(cdev, "activate ncm\n");
net = gether_connect(&ncm->port);
ncm->port.cdc_filter = DEFAULT_FILTER;
DBG(cdev, "activate ncm\n");
net = gether_connect(&ncm->port);
@@
-886,7
+882,7
@@
static int ncm_get_alt(struct usb_function *f, unsigned intf)
if (intf == ncm->ctrl_id)
return 0;
if (intf == ncm->ctrl_id)
return 0;
- return ncm->port.in_ep->
driver_data
? 1 : 0;
+ return ncm->port.in_ep->
enabled
? 1 : 0;
}
static struct sk_buff *package_for_tx(struct f_ncm *ncm)
}
static struct sk_buff *package_for_tx(struct f_ncm *ncm)
@@
-1277,15
+1273,14
@@
static void ncm_disable(struct usb_function *f)
DBG(cdev, "ncm deactivated\n");
DBG(cdev, "ncm deactivated\n");
- if (ncm->port.in_ep->
driver_data
) {
+ if (ncm->port.in_ep->
enabled
) {
ncm->timer_stopping = true;
ncm->netdev = NULL;
gether_disconnect(&ncm->port);
}
ncm->timer_stopping = true;
ncm->netdev = NULL;
gether_disconnect(&ncm->port);
}
- if (ncm->notify->
driver_data
) {
+ if (ncm->notify->
enabled
) {
usb_ep_disable(ncm->notify);
usb_ep_disable(ncm->notify);
- ncm->notify->driver_data = NULL;
ncm->notify->desc = NULL;
}
}
ncm->notify->desc = NULL;
}
}
@@
-1403,19
+1398,16
@@
static int ncm_bind(struct usb_configuration *c, struct usb_function *f)
if (!ep)
goto fail;
ncm->port.in_ep = ep;
if (!ep)
goto fail;
ncm->port.in_ep = ep;
- ep->driver_data = cdev; /* claim */
ep = usb_ep_autoconfig(cdev->gadget, &fs_ncm_out_desc);
if (!ep)
goto fail;
ncm->port.out_ep = ep;
ep = usb_ep_autoconfig(cdev->gadget, &fs_ncm_out_desc);
if (!ep)
goto fail;
ncm->port.out_ep = ep;
- ep->driver_data = cdev; /* claim */
ep = usb_ep_autoconfig(cdev->gadget, &fs_ncm_notify_desc);
if (!ep)
goto fail;
ncm->notify = ep;
ep = usb_ep_autoconfig(cdev->gadget, &fs_ncm_notify_desc);
if (!ep)
goto fail;
ncm->notify = ep;
- ep->driver_data = cdev; /* claim */
status = -ENOMEM;
status = -ENOMEM;
@@
-1469,14
+1461,6
@@
fail:
usb_ep_free_request(ncm->notify, ncm->notify_req);
}
usb_ep_free_request(ncm->notify, ncm->notify_req);
}
- /* we might as well release our claims on endpoints */
- if (ncm->notify)
- ncm->notify->driver_data = NULL;
- if (ncm->port.out_ep)
- ncm->port.out_ep->driver_data = NULL;
- if (ncm->port.in_ep)
- ncm->port.in_ep->driver_data = NULL;
-
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
return status;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
return status;
@@
-1504,10
+1488,10
@@
USB_ETHERNET_CONFIGFS_ITEM_ATTR_QMULT(ncm);
USB_ETHERNET_CONFIGFS_ITEM_ATTR_IFNAME(ncm);
static struct configfs_attribute *ncm_attrs[] = {
USB_ETHERNET_CONFIGFS_ITEM_ATTR_IFNAME(ncm);
static struct configfs_attribute *ncm_attrs[] = {
- &
f_ncm_opts_dev_addr.att
r,
- &
f_ncm_opts_host_addr.att
r,
- &
f_ncm_opts_qmult.attr
,
- &
f_ncm_opts_ifname.attr
,
+ &
ncm_opts_attr_dev_add
r,
+ &
ncm_opts_attr_host_add
r,
+ &
ncm_opts_attr_qmult
,
+ &
ncm_opts_attr_ifname
,
NULL,
};
NULL,
};