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
e2174ca4
Commit
e2174ca4
authored
Feb 17, 2011
by
Gustavo F. Padovan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bluetooth: fix errors reported by checkpatch.pl
Signed-off-by:
Gustavo F. Padovan
<
padovan@profusion.mobi
>
parent
138d22ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
22 deletions
+18
-22
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_core.c
+3
-7
net/bluetooth/l2cap_sock.c
net/bluetooth/l2cap_sock.c
+15
-15
No files found.
net/bluetooth/l2cap_core.c
View file @
e2174ca4
...
...
@@ -1671,10 +1671,6 @@ int l2cap_build_conf_req(struct sock *sk, void *data)
break
;
}
/* FIXME: Need actual value of the flush timeout */
//if (flush_to != L2CAP_DEFAULT_FLUSH_TO)
// l2cap_add_conf_opt(&ptr, L2CAP_CONF_FLUSH_TO, 2, pi->flush_to);
req
->
dcid
=
cpu_to_le16
(
pi
->
dcid
);
req
->
flags
=
cpu_to_le16
(
0
);
...
...
@@ -2501,7 +2497,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm
return
0
;
}
static
in
t
inline
l2cap_check_conn_param
(
u16
min
,
u16
max
,
u16
latency
,
static
in
line
int
l2cap_check_conn_param
(
u16
min
,
u16
max
,
u16
latency
,
u16
to_multiplier
)
{
u16
max_latency
;
...
...
@@ -2539,8 +2535,8 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,
return
-
EPROTO
;
req
=
(
struct
l2cap_conn_param_update_req
*
)
data
;
min
=
__le16_to_cpu
(
req
->
min
);
max
=
__le16_to_cpu
(
req
->
max
);
min
=
__le16_to_cpu
(
req
->
min
);
max
=
__le16_to_cpu
(
req
->
max
);
latency
=
__le16_to_cpu
(
req
->
latency
);
to_multiplier
=
__le16_to_cpu
(
req
->
to_multiplier
);
...
...
net/bluetooth/l2cap_sock.c
View file @
e2174ca4
...
...
@@ -1127,30 +1127,30 @@ static const struct net_proto_family l2cap_sock_family_ops = {
int
__init
l2cap_init_sockets
(
void
)
{
int
err
;
int
err
;
err
=
proto_register
(
&
l2cap_proto
,
0
);
if
(
err
<
0
)
return
err
;
err
=
proto_register
(
&
l2cap_proto
,
0
);
if
(
err
<
0
)
return
err
;
err
=
bt_sock_register
(
BTPROTO_L2CAP
,
&
l2cap_sock_family_ops
);
if
(
err
<
0
)
goto
error
;
err
=
bt_sock_register
(
BTPROTO_L2CAP
,
&
l2cap_sock_family_ops
);
if
(
err
<
0
)
goto
error
;
BT_INFO
(
"L2CAP socket layer initialized"
);
BT_INFO
(
"L2CAP socket layer initialized"
);
return
0
;
return
0
;
error:
BT_ERR
(
"L2CAP socket registration failed"
);
proto_unregister
(
&
l2cap_proto
);
return
err
;
BT_ERR
(
"L2CAP socket registration failed"
);
proto_unregister
(
&
l2cap_proto
);
return
err
;
}
void
l2cap_cleanup_sockets
(
void
)
{
if
(
bt_sock_unregister
(
BTPROTO_L2CAP
)
<
0
)
BT_ERR
(
"L2CAP socket unregistration failed"
);
if
(
bt_sock_unregister
(
BTPROTO_L2CAP
)
<
0
)
BT_ERR
(
"L2CAP socket unregistration failed"
);
proto_unregister
(
&
l2cap_proto
);
proto_unregister
(
&
l2cap_proto
);
}
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