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
Kirill Smelkov
linux
Commits
eaa04dc3
Commit
eaa04dc3
authored
Nov 15, 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
8812304c
68ae6639
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
net/bluetooth/hci_conn.c
net/bluetooth/hci_conn.c
+1
-0
net/bluetooth/l2cap.c
net/bluetooth/l2cap.c
+9
-4
No files found.
net/bluetooth/hci_conn.c
View file @
eaa04dc3
...
...
@@ -211,6 +211,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
conn
->
type
=
type
;
conn
->
mode
=
HCI_CM_ACTIVE
;
conn
->
state
=
BT_OPEN
;
conn
->
auth_type
=
HCI_AT_GENERAL_BONDING
;
conn
->
power_save
=
1
;
conn
->
disc_timeout
=
HCI_DISCONN_TIMEOUT
;
...
...
net/bluetooth/l2cap.c
View file @
eaa04dc3
...
...
@@ -2205,7 +2205,7 @@ static int l2cap_build_conf_req(struct sock *sk, void *data)
{
struct
l2cap_pinfo
*
pi
=
l2cap_pi
(
sk
);
struct
l2cap_conf_req
*
req
=
data
;
struct
l2cap_conf_rfc
rfc
=
{
.
mode
=
L2CAP_MODE_
ERTM
};
struct
l2cap_conf_rfc
rfc
=
{
.
mode
=
L2CAP_MODE_
BASIC
};
void
*
ptr
=
req
->
data
;
BT_DBG
(
"sk %p"
,
sk
);
...
...
@@ -2394,6 +2394,10 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
rfc
.
monitor_timeout
=
L2CAP_DEFAULT_MONITOR_TO
;
pi
->
conf_state
|=
L2CAP_CONF_MODE_DONE
;
l2cap_add_conf_opt
(
&
ptr
,
L2CAP_CONF_RFC
,
sizeof
(
rfc
),
(
unsigned
long
)
&
rfc
);
break
;
case
L2CAP_MODE_STREAMING
:
...
...
@@ -2401,6 +2405,10 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
pi
->
max_pdu_size
=
rfc
.
max_pdu_size
;
pi
->
conf_state
|=
L2CAP_CONF_MODE_DONE
;
l2cap_add_conf_opt
(
&
ptr
,
L2CAP_CONF_RFC
,
sizeof
(
rfc
),
(
unsigned
long
)
&
rfc
);
break
;
default:
...
...
@@ -2410,9 +2418,6 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
rfc
.
mode
=
pi
->
mode
;
}
l2cap_add_conf_opt
(
&
ptr
,
L2CAP_CONF_RFC
,
sizeof
(
rfc
),
(
unsigned
long
)
&
rfc
);
if
(
result
==
L2CAP_CONF_SUCCESS
)
pi
->
conf_state
|=
L2CAP_CONF_OUTPUT_DONE
;
}
...
...
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