]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: usb: usbnet: use proper ep number macros
authorOliver Neukum <oneukum@suse.com>
Wed, 13 May 2026 13:29:16 +0000 (15:29 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 15 May 2026 01:19:03 +0000 (18:19 -0700)
We have macros to retrieve endpoint numbers now.
Use them.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://patch.msgid.link/20260513132916.39896-1-oneukum@suse.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/usbnet.c

index b72ba0803392bb3cd0a8321c5d06dee29cc09690..25518635b7b72dc1e6b40ba082848091326c1560 100644 (file)
@@ -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 */