mirror of https://gitee.com/openkylin/linux.git
usb-gadget: fix warning in ethernet
Driver was taking max() of a size_t and u32 which causes complaint about comparison of different types. Stumbled on this accidently in my config, never used. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
962f3ffa92
commit
45d1b7ae20
|
@ -241,7 +241,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
|
||||||
size -= size % out->maxpacket;
|
size -= size % out->maxpacket;
|
||||||
|
|
||||||
if (dev->port_usb->is_fixed)
|
if (dev->port_usb->is_fixed)
|
||||||
size = max(size, dev->port_usb->fixed_out_len);
|
size = max_t(size_t, size, dev->port_usb->fixed_out_len);
|
||||||
|
|
||||||
skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
|
skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
|
||||||
if (skb == NULL) {
|
if (skb == NULL) {
|
||||||
|
|
Loading…
Reference in New Issue