Permalink
Browse files

fixing compile error

Signed-off-by: Bryan Smith <zarboz@gmail.com>
  • Loading branch information...
1 parent 0b24406 commit 86252c0c18a80082a2fb05c823b2d3a90a959b03 @zarboz zarboz committed May 9, 2013
Showing with 17 additions and 4 deletions.
  1. +4 −4 net/bluetooth/hci_conn.c
  2. +6 −0 net/bluetooth/hidbrcm/Kconfig
  3. +7 −0 net/bluetooth/hidbrcm/Makefile
View
@@ -393,7 +393,7 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
}
EXPORT_SYMBOL(hci_le_start_enc);
-void hci_le_ltk_reply(struct hci_conn *conn, __u8 ltk[16])
+#define LTK_SIZE 16
void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[LTK_SIZE])
{
@@ -402,12 +402,12 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[LTK_SIZE])
BT_DBG("%p", conn);
- memset(&cp, 0, sizeof (cp));
+ memset(&cp, 0, sizeof(cp));
cp.handle = cpu_to_le16(conn->handle);
- memcpy (cp.ltk, ltk, sizeof (*ltk));
+ memcpy(cp.ltk, ltk, LTK_SIZE);
- hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof (cp), &cp);
+ hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
}
EXPORT_SYMBOL(hci_le_ltk_reply);
@@ -0,0 +1,6 @@
+config BT_HID_BRCM
+ bool "BRCM HID support"
+ depends on BT
+ help
+ Say Y here to compile BRCM HID support into the kernel
+
@@ -0,0 +1,7 @@
+#
+# Makefile for Broadcom bthid Driver
+#
+
+obj-$(CONFIG_BT_HID_BRCM) += bthid.o
+
+hidbrcm-objs := bthid.o

0 comments on commit 86252c0

Please sign in to comment.