2.5.68-bk10 drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared

2.5.68-bk10 drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared

[Grzegorz Jaskiewicz]

drivers/bluetooth/hci_usb.c: In function `hci_usb_send_bulk':
drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared (first use
in this function)
drivers/bluetooth/hci_usb.c:461: (Each undeclared identifier is reported
only once
drivers/bluetooth/hci_usb.c:461: for each function it appears in.)
make[2]: *** [drivers/bluetooth/hci_usb.o] Error 1
make[1]: *** [drivers/bluetooth] Error 2
make: *** [drivers] Error 2

probably #define USB_ZERO_PACKET should help, but i am not convinent.

-- 
Grzegorz Jaskiewicz <gj@pointblue.com.pl>
K4 labs

Re: 2.5.68-bk10 drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared

[Greg KH]

On Wed, Apr 30, 2003 at 11:20:48PM +0100, Grzegorz Jaskiewicz wrote:
> drivers/bluetooth/hci_usb.c: In function `hci_usb_send_bulk':
> drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared (first use
> in this function)
> drivers/bluetooth/hci_usb.c:461: (Each undeclared identifier is reported
> only once
> drivers/bluetooth/hci_usb.c:461: for each function it appears in.)
> make[2]: *** [drivers/bluetooth/hci_usb.o] Error 1
> make[1]: *** [drivers/bluetooth] Error 2
> make: *** [drivers] Error 2
> 
> probably #define USB_ZERO_PACKET should help, but i am not convinent.

s/USB_ZERO_PACKET/URB_ZERO_PACKET/ in the driver will solve this one.
Care to send a patch to Max?

thanks,

greg k-h

Re: 2.5.68-bk10 drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared

[Marcel Holtmann]

Hi Grzegorz,

> drivers/bluetooth/hci_usb.c: In function `hci_usb_send_bulk':
> drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared (first use
> in this function)
> drivers/bluetooth/hci_usb.c:461: (Each undeclared identifier is reported
> only once
> drivers/bluetooth/hci_usb.c:461: for each function it appears in.)
> make[2]: *** [drivers/bluetooth/hci_usb.o] Error 1
> make[1]: *** [drivers/bluetooth] Error 2
> make: *** [drivers] Error 2
> 
> probably #define USB_ZERO_PACKET should help, but i am not convinent.

I have fixed this problem in my repository. You can use the patch below.

Regards

Marcel


diff -Nru a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
--- a/drivers/bluetooth/hci_usb.c       Thu May  1 00:32:06 2003
+++ b/drivers/bluetooth/hci_usb.c       Thu May  1 00:32:06 2003
@@ -64,8 +64,8 @@
 #endif
 
 #ifndef CONFIG_BT_USB_ZERO_PACKET
-#undef  USB_ZERO_PACKET
-#define USB_ZERO_PACKET 0
+#undef  URB_ZERO_PACKET
+#define URB_ZERO_PACKET 0
 #endif
 
 static struct usb_driver hci_usb_driver; 
@@ -458,7 +458,7 @@
        pipe = usb_sndbulkpipe(husb->udev, husb->bulk_out_ep->desc.bEndpointAddress);
        usb_fill_bulk_urb(urb, husb->udev, pipe, skb->data, skb->len, 
                        hci_usb_tx_complete, husb);
-       urb->transfer_flags = USB_ZERO_PACKET;
+       urb->transfer_flags = URB_ZERO_PACKET;
 
        BT_DBG("%s skb %p len %d", husb->hdev.name, skb, skb->len);