diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-08 09:47:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-08 09:47:16 +0200 |
| commit | 58318cd4df415aaeaad1a7306cf1d35dad9a21c3 (patch) | |
| tree | 794fef2338813360e0f535511f7d6f97a08254f0 /drivers/usb/gadget | |
| parent | usbip: usbip_host: run rebind from exit when module is removed (diff) | |
| parent | Linux 4.17-rc4 (diff) | |
| download | linux-dev-58318cd4df415aaeaad1a7306cf1d35dad9a21c3.tar.xz linux-dev-58318cd4df415aaeaad1a7306cf1d35dad9a21c3.zip | |
Merge 4.17-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/function/f_phonet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c index 7889bcc0509a..8b72b192c747 100644 --- a/drivers/usb/gadget/function/f_phonet.c +++ b/drivers/usb/gadget/function/f_phonet.c @@ -221,7 +221,7 @@ static void pn_tx_complete(struct usb_ep *ep, struct usb_request *req) netif_wake_queue(dev); } -static int pn_net_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t pn_net_xmit(struct sk_buff *skb, struct net_device *dev) { struct phonet_port *port = netdev_priv(dev); struct f_phonet *fp; |