From: a17671 Date: Wed, 26 Dec 2018 08:13:03 +0000 (+0800) Subject: usbnet:Solve the CFI warning message X-Git-Tag: MMI-QSAS30.62-33-3~318 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b2bed32016a23465b5816e52094b93570c0094b6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git usbnet:Solve the CFI warning message After CFI feature integrated into the Android Kernel Motorola USBLAN driver will generate warning/panic Due to the mismatch of the return type Change-Id: Ia9d1d78a03c542426d213fdb69274eca817e2ae2 Signed-off-by: a17671 Reviewed-on: https://gerrit.mot.com/1287119 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- diff --git a/drivers/usb/gadget/function/f_usbnet.c b/drivers/usb/gadget/function/f_usbnet.c index 5c1be20fc618..7c6f0cb120d8 100644 --- a/drivers/usb/gadget/function/f_usbnet.c +++ b/drivers/usb/gadget/function/f_usbnet.c @@ -341,7 +341,7 @@ struct usb_request *usb_get_xmit_request(int stop_flag, struct net_device *dev) return req; } -static int usb_ether_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t usb_ether_xmit(struct sk_buff *skb, struct net_device *dev) { struct usbnet_context *context = netdev_priv(dev); struct usb_request *req;