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
6d33a83a
Commit
6d33a83a
authored
Mar 19, 2003
by
Marcel Holtmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux.bkbits.net/linux-2.5
into hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.5
parents
d99c48c6
95048540
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
include/net/bluetooth/hci_core.h
include/net/bluetooth/hci_core.h
+6
-3
No files found.
include/net/bluetooth/hci_core.h
View file @
6d33a83a
...
@@ -262,7 +262,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *src);
...
@@ -262,7 +262,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *src);
int
hci_conn_auth
(
struct
hci_conn
*
conn
);
int
hci_conn_auth
(
struct
hci_conn
*
conn
);
int
hci_conn_encrypt
(
struct
hci_conn
*
conn
);
int
hci_conn_encrypt
(
struct
hci_conn
*
conn
);
static
inline
void
hci_conn_set_timer
(
struct
hci_conn
*
conn
,
long
timeout
)
static
inline
void
hci_conn_set_timer
(
struct
hci_conn
*
conn
,
unsigned
long
timeout
)
{
{
mod_timer
(
&
conn
->
timer
,
jiffies
+
timeout
);
mod_timer
(
&
conn
->
timer
,
jiffies
+
timeout
);
}
}
...
@@ -280,8 +280,11 @@ static inline void hci_conn_hold(struct hci_conn *conn)
...
@@ -280,8 +280,11 @@ static inline void hci_conn_hold(struct hci_conn *conn)
static
inline
void
hci_conn_put
(
struct
hci_conn
*
conn
)
static
inline
void
hci_conn_put
(
struct
hci_conn
*
conn
)
{
{
if
(
atomic_dec_and_test
(
&
conn
->
refcnt
)
&&
conn
->
out
)
if
(
atomic_dec_and_test
(
&
conn
->
refcnt
)
&&
conn
->
out
)
{
hci_conn_set_timer
(
conn
,
HCI_DISCONN_TIMEOUT
);
unsigned
long
timeo
=
(
conn
->
type
==
ACL_LINK
)
?
HCI_DISCONN_TIMEOUT
:
HZ
/
100
;
hci_conn_set_timer
(
conn
,
timeo
);
}
}
}
/* ----- HCI tasks ----- */
/* ----- HCI tasks ----- */
...
...
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