From: Oliver Neukum Date: Wed, 13 May 2026 13:29:16 +0000 (+0200) Subject: net: usb: usbnet: use proper ep number macros X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=822d4a8e390a08ccfaf2abb347ae670b230b196f;p=thirdparty%2Fkernel%2Flinux.git net: usb: usbnet: use proper ep number macros We have macros to retrieve endpoint numbers now. Use them. Signed-off-by: Oliver Neukum Link: https://patch.msgid.link/20260513132916.39896-1-oneukum@suse.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index b72ba0803392..25518635b7b7 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -149,10 +149,8 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf) return tmp; } - dev->in = usb_rcvbulkpipe(dev->udev, - in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); - dev->out = usb_sndbulkpipe(dev->udev, - out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); + dev->in = usb_rcvbulkpipe(dev->udev, usb_endpoint_num(&in->desc)); + dev->out = usb_sndbulkpipe(dev->udev, usb_endpoint_num(&out->desc)); dev->status = status; return 0; } @@ -232,9 +230,7 @@ static int init_status(struct usbnet *dev, struct usb_interface *intf) if (!dev->driver_info->status) return 0; - pipe = usb_rcvintpipe(dev->udev, - dev->status->desc.bEndpointAddress - & USB_ENDPOINT_NUMBER_MASK); + pipe = usb_rcvintpipe(dev->udev, usb_endpoint_num(&dev->status->desc)); maxp = usb_maxpacket(dev->udev, pipe); /* avoid 1 msec chatter: min 8 msec poll rate */