[Cbe-oss-dev] Build fails on Geoff's latest Git tree (2.6.24-rc2-g33ee1815-dirty)

[Grant Ferley]

Hi all:

I just attempted building the latest kernel from Geoff's git tree
(2.6.24-rc2-g33ee1815-dirty) and it errors when building
net/Bluetooth/hci_core.c.  Took a quick peak, seems the PS3-specific
#INCLUDE around line 260 is failing due to newer changes in hci_send_cmd().
I quickly adjusted to emulate code above the failure and compile worked.  I
don't claim to know if my fix is correct, I only took a cursory glance at
the code as I've never hacked the Bluetooth code (other than adding support
for the PS3 controller awhile ago, which has slowly become supported).  I'm
sure this would be fixed pretty much as soon as someone smarter than I tried
compiling, but in the mean time, below is my diff to what came from the git
tree:

 

--- a/net/bluetooth/hci_core.c

+++ b/net/bluetooth/hci_core.c

@@ -257,7 +257,7 @@ static void hci_init_req(struct hci_dev *hdev, unsigned
long

                cp.flt_type = HCI_FLT_CONN_SETUP;

                cp.cond_type = 0; /* all devices */

                cp.condition = 1; /* auto accept is off */

-               hci_send_cmd(hdev, OGF_HOST_CTL, OCF_SET_EVENT_FLT,
sizeof(cp),

+               hci_send_cmd(hdev, HCI_OP_SET_EVENT_FLT, sizeof(cp),

                        &cp);

        }

 #endif

 

Cheers,

Grant

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/cbe-oss-dev/attachments/20071110/09283fe8/attachment.htm>