Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
41979f50
Commit
41979f50
authored
Jul 14, 2003
by
Maksim Krasnyanskiy
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux-bt.bkbits.net/marcel-2.5
into qualcomm.com:/home/kernel/bt-2.5
parents
2157c296
06e15cb5
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
76 additions
and
8 deletions
+76
-8
CREDITS
CREDITS
+2
-1
MAINTAINERS
MAINTAINERS
+50
-2
drivers/bluetooth/hci_usb.c
drivers/bluetooth/hci_usb.c
+2
-1
include/net/bluetooth/hci.h
include/net/bluetooth/hci.h
+2
-0
net/bluetooth/hci_core.c
net/bluetooth/hci_core.c
+6
-3
net/bluetooth/hci_event.c
net/bluetooth/hci_event.c
+13
-0
net/bluetooth/hci_sock.c
net/bluetooth/hci_sock.c
+1
-1
No files found.
CREDITS
View file @
41979f50
...
...
@@ -1384,7 +1384,8 @@ S: USA
N: Marcel Holtmann
E: marcel@holtmann.org
W: http://www.holtmann.org
D: Author of the Linux Bluetooth Subsystem PC Card drivers
D: Author and maintainer of the various Bluetooth HCI drivers
D: Various other Bluetooth related patches, cleanups and fixes
S: Germany
N: Rob W. W. Hooft
...
...
MAINTAINERS
View file @
41979f50
...
...
@@ -334,18 +334,66 @@ M: axboe@suse.de
L: linux-kernel@vger.kernel.org
S: Maintained
BLUETOOTH SUBSYSTEM
(BlueZ)
BLUETOOTH SUBSYSTEM
P: Maxim Krasnyansky
M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
BLUETOOTH SUBSYSTEM (PC Card Drivers)
BLUETOOTH RFCOMM LAYER
P: Maxim Krasnyansky
M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
BLUETOOTH BNEP LAYER
P: Maxim Krasnyansky
M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
BLUETOOTH HCI USB DRIVER
P: Maxim Krasnyansky
M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
BLUETOOTH HCI UART DRIVER
P: Maxim Krasnyansky
M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
BLUETOOTH HCI DTL1 DRIVER
P: Marcel Holtmann
M: marcel@holtmann.org
W: http://www.holtmann.org/linux/bluetooth/
S: Maintained
BLUETOOTH HCI BLUECARD DRIVER
P: Marcel Holtmann
M: marcel@holtmann.org
W: http://www.holtmann.org/linux/bluetooth/
S: Maintained
BLUETOOTH HCI BT3C DRIVER
P: Marcel Holtmann
M: marcel@holtmann.org
W: http://www.holtmann.org/linux/bluetooth/
S: Maintained
BLUETOOTH HCI BTUART DRIVER
P: Marcel Holtmann
M: marcel@holtmann.org
W: http://www.holtmann.org/linux/bluetooth/
S: Maintained
BLUETOOTH HCI VHCI DRIVER
P: Maxim Krasnyansky
M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
BONDING DRIVER
P: Chad Tindel
M: ctindel@users.sourceforge.net
...
...
drivers/bluetooth/hci_usb.c
View file @
41979f50
...
...
@@ -303,6 +303,7 @@ static int hci_usb_open(struct hci_dev *hdev)
hci_usb_bulk_rx_submit
(
husb
);
#ifdef CONFIG_BT_USB_SCO
if
(
husb
->
isoc_iface
)
hci_usb_isoc_rx_submit
(
husb
);
#endif
}
else
{
...
...
include/net/bluetooth/hci.h
View file @
41979f50
...
...
@@ -304,6 +304,8 @@ struct hci_cp_inquiry {
__u8
num_rsp
;
}
__attribute__
((
packed
));
#define OCF_INQUIRY_CANCEL 0x0002
#define OCF_LINK_KEY_REPLY 0x000B
#define OCF_LINK_KEY_NEG_REPLY 0x000C
struct
hci_cp_link_key_reply
{
...
...
net/bluetooth/hci_core.c
View file @
41979f50
...
...
@@ -394,7 +394,7 @@ int hci_inquiry(unsigned long arg)
{
struct
hci_inquiry_req
ir
;
struct
hci_dev
*
hdev
;
int
err
=
0
,
do_inquiry
=
0
;
int
err
=
0
,
do_inquiry
=
0
,
max_rsp
;
long
timeo
;
__u8
*
buf
,
*
ptr
;
...
...
@@ -417,16 +417,19 @@ int hci_inquiry(unsigned long arg)
if
(
do_inquiry
&&
(
err
=
hci_request
(
hdev
,
hci_inq_req
,
(
unsigned
long
)
&
ir
,
timeo
))
<
0
)
goto
done
;
/* for unlimited number of responses we will use buffer with 255 entries */
max_rsp
=
(
ir
.
num_rsp
==
0
)
?
255
:
ir
.
num_rsp
;
/* cache_dump can't sleep. Therefore we allocate temp buffer and then
* copy it to the user space.
*/
if
(
!
(
buf
=
kmalloc
(
sizeof
(
struct
inquiry_info
)
*
ir
.
num
_rsp
,
GFP_KERNEL
)))
{
if
(
!
(
buf
=
kmalloc
(
sizeof
(
struct
inquiry_info
)
*
max
_rsp
,
GFP_KERNEL
)))
{
err
=
-
ENOMEM
;
goto
done
;
}
hci_dev_lock_bh
(
hdev
);
ir
.
num_rsp
=
inquiry_cache_dump
(
hdev
,
ir
.
num
_rsp
,
buf
);
ir
.
num_rsp
=
inquiry_cache_dump
(
hdev
,
max
_rsp
,
buf
);
hci_dev_unlock_bh
(
hdev
);
BT_DBG
(
"num_rsp %d"
,
ir
.
num_rsp
);
...
...
net/bluetooth/hci_event.c
View file @
41979f50
...
...
@@ -62,9 +62,22 @@
/* Command Complete OGF LINK_CTL */
static
void
hci_cc_link_ctl
(
struct
hci_dev
*
hdev
,
__u16
ocf
,
struct
sk_buff
*
skb
)
{
__u8
status
;
BT_DBG
(
"%s ocf 0x%x"
,
hdev
->
name
,
ocf
);
switch
(
ocf
)
{
case
OCF_INQUIRY_CANCEL
:
status
=
*
((
__u8
*
)
skb
->
data
);
if
(
status
)
{
BT_DBG
(
"%s Inquiry cancel error: status 0x%x"
,
hdev
->
name
,
status
);
}
else
{
clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
);
hci_req_complete
(
hdev
,
status
);
}
break
;
default:
BT_DBG
(
"%s Command complete: ogf LINK_CTL ocf %x"
,
hdev
->
name
,
ocf
);
break
;
...
...
net/bluetooth/hci_sock.c
View file @
41979f50
...
...
@@ -75,7 +75,7 @@ static struct hci_sec_filter hci_sec_filter = {
/* OGF_LINK_POLICY */
{
0x1200
,
0x0
,
0x0
,
0x0
},
/* OGF_HOST_CTL */
{
0x80100000
,
0x2a
,
0x0
,
0x0
},
{
0x80100000
,
0x2
02
a
,
0x0
,
0x0
},
/* OGF_INFO_PARAM */
{
0x22a
,
0x0
,
0x0
,
0x0
},
/* OGF_STATUS_PARAM */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment