|
@@ -97,7 +97,6 @@ static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16
|
|
return c;
|
|
return c;
|
|
}
|
|
}
|
|
return NULL;
|
|
return NULL;
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 cid)
|
|
static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 cid)
|
|
@@ -1901,7 +1900,7 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
|
|
{
|
|
{
|
|
struct l2cap_conf_efs efs;
|
|
struct l2cap_conf_efs efs;
|
|
|
|
|
|
- switch(chan->mode) {
|
|
|
|
|
|
+ switch (chan->mode) {
|
|
case L2CAP_MODE_ERTM:
|
|
case L2CAP_MODE_ERTM:
|
|
efs.id = chan->local_id;
|
|
efs.id = chan->local_id;
|
|
efs.stype = chan->local_stype;
|
|
efs.stype = chan->local_stype;
|
|
@@ -3014,7 +3013,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
|
|
|
|
|
|
/* don't delete l2cap channel if sk is owned by user */
|
|
/* don't delete l2cap channel if sk is owned by user */
|
|
if (sock_owned_by_user(sk)) {
|
|
if (sock_owned_by_user(sk)) {
|
|
- l2cap_state_change(chan,BT_DISCONN);
|
|
|
|
|
|
+ l2cap_state_change(chan, BT_DISCONN);
|
|
__clear_chan_timer(chan);
|
|
__clear_chan_timer(chan);
|
|
__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);
|
|
__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);
|
|
bh_unlock_sock(sk);
|
|
bh_unlock_sock(sk);
|