Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
17e4d43e
Commit
17e4d43e
authored
May 16, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
parents
542cc793
3d7a9d1c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
net/bluetooth/hci_conn.c
net/bluetooth/hci_conn.c
+3
-3
net/bluetooth/hci_event.c
net/bluetooth/hci_event.c
+1
-1
net/bluetooth/hci_sysfs.c
net/bluetooth/hci_sysfs.c
+3
-0
No files found.
net/bluetooth/hci_conn.c
View file @
17e4d43e
...
...
@@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg)
switch
(
conn
->
state
)
{
case
BT_CONNECT
:
case
BT_CONNECT2
:
if
(
conn
->
type
==
ACL_LINK
)
if
(
conn
->
type
==
ACL_LINK
&&
conn
->
out
)
hci_acl_connect_cancel
(
conn
);
else
hci_acl_disconn
(
conn
,
0x13
);
break
;
case
BT_CONFIG
:
case
BT_CONNECTED
:
...
...
@@ -292,6 +290,8 @@ int hci_conn_del(struct hci_conn *conn)
hci_conn_del_sysfs
(
conn
);
hci_dev_put
(
hdev
);
return
0
;
}
...
...
net/bluetooth/hci_event.c
View file @
17e4d43e
...
...
@@ -1493,7 +1493,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff
hci_dev_lock
(
hdev
);
conn
=
hci_conn_hash_lookup_ba
(
hdev
,
ACL_LINK
,
&
ev
->
bdaddr
);
if
(
conn
)
{
if
(
conn
&&
conn
->
state
==
BT_CONNECTED
)
{
hci_conn_hold
(
conn
);
conn
->
disc_timeout
=
HCI_PAIRING_TIMEOUT
;
hci_conn_put
(
conn
);
...
...
net/bluetooth/hci_sysfs.c
View file @
17e4d43e
...
...
@@ -99,6 +99,8 @@ static void add_conn(struct work_struct *work)
BT_ERR
(
"Failed to register connection device"
);
return
;
}
hci_dev_hold
(
hdev
);
}
/*
...
...
@@ -134,6 +136,7 @@ static void del_conn(struct work_struct *work)
device_del
(
&
conn
->
dev
);
put_device
(
&
conn
->
dev
);
hci_dev_put
(
hdev
);
}
...
...
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