[PATCH] 2.5.69 : drivers/bluetooth/hci_usb.c

[PATCH] 2.5.69 : drivers/bluetooth/hci_usb.c

[Frank Davis]

Hello,

The following patch addresses the compile error below (I haven't seent 
this previously reported.). I suspect there's a cleaner patch. Please review. Thanks.

Regards,
Frank

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

--- linux/drivers/bluetooth/hci_usb.c.old	2003-05-05 16:38:58.000000000 -0400
+++ linux/drivers/bluetooth/hci_usb.c	2003-05-05 16:40:35.000000000 -0400
@@ -68,6 +68,8 @@
 #define USB_ZERO_PACKET 0
 #endif
 
+#define USB_ZERO_PACKET 0
+
 static struct usb_driver hci_usb_driver; 
 
 static struct usb_device_id bluetooth_ids[] = {

Re: [PATCH] 2.5.69 : drivers/bluetooth/hci_usb.c

[Marcel Holtmann]

Hi Frank,

> The following patch addresses the compile error below (I haven't seent 
> this previously reported.). I suspect there's a cleaner patch. Please review. Thanks.
> 
> 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

this was already reported by Grzegorz Jaskiewicz for 2.5.68-bk10 and I
have fixed it in my repositories. See mailing list archive for the
patch.

Regards

Marcel

Re: [PATCH] 2.5.69 : drivers/bluetooth/hci_usb.c

[Michael Buesch]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Monday 05 May 2003 22:47, Frank Davis wrote:
> Hello,
>
> The following patch addresses the compile error below (I haven't seent
> this previously reported.). I suspect there's a cleaner patch. Please
> review. Thanks.
>
> Regards,
> Frank
>
> 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
>
> --- linux/drivers/bluetooth/hci_usb.c.old	2003-05-05 16:38:58.000000000
> -0400 +++ linux/drivers/bluetooth/hci_usb.c	2003-05-05 16:40:35.000000000
> -0400 @@ -68,6 +68,8 @@
>  #define USB_ZERO_PACKET 0
>  #endif
>
> +#define USB_ZERO_PACKET 0
> +
>  static struct usb_driver hci_usb_driver;
>
>  static struct usb_device_id bluetooth_ids[] = {
>

> [snip] I suspect there's a cleaner patch. [/snip]

And I suspect, this patch is wrong. :)

Maxim Krasnyansky, what has USB_ZERO_PACKET to be set to if
CONFIG_BT_USB_ZERO_PACKET is enabled? I didn't find it out.

- -- 
Regards Michael Büsch
http://www.8ung.at/tuxsoft
 22:52:55 up  5:17,  2 users,  load average: 1.20, 1.25, 1.15
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+ttAvoxoigfggmSgRAsZUAJ9d9XZ1FSDr2zj/ssAJOJgbyjJUvACeN43j
RMYAoDK1ZknM0GrNi4lxnwE=
=l6wk
-----END PGP SIGNATURE-----

Re: [PATCH] 2.5.69 : drivers/bluetooth/hci_usb.c

[Marcel Holtmann]

Hi Michael,

> And I suspect, this patch is wrong. :)

here is the correct patch.

Regards

Marcel

diff -Nru a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
--- a/drivers/bluetooth/hci_usb.c       Mon May  5 23:04:11 2003
+++ b/drivers/bluetooth/hci_usb.c       Mon May  5 23:04:11 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);