lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: small styles clean ups to l2cap_core.c

Browse Source 
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan
2011-11-01 14:06:23 -02:00
parent 0e8b207e8a
commit 3e6b3b95f2
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/bluetooth/l2cap_core.c
View File

@@ -2237,11 +2237,10 @@ done:
return -ECONNREFUSED; return -ECONNREFUSED;
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
sizeof(efs), sizeof(efs),
(unsigned long) &efs); (unsigned long) &efs);
} else { } else {
/* Send PENDING Conf Rsp and mark state /* Send PENDING Conf Rsp */
local PENDING */
result = L2CAP_CONF_PENDING; result = L2CAP_CONF_PENDING;
set_bit(CONF_LOC_CONF_PEND, &chan->conf_state); set_bit(CONF_LOC_CONF_PEND, &chan->conf_state);
} }
@@ -2373,8 +2372,8 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
case L2CAP_CONF_EWS: case L2CAP_CONF_EWS:
chan->tx_win = min_t(u16, val, chan->tx_win = min_t(u16, val,
L2CAP_DEFAULT_EXT_WINDOW); L2CAP_DEFAULT_EXT_WINDOW);
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
2, chan->tx_win); chan->tx_win);
break; break;
} }
} }
@@ -2801,7 +2800,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
set_bit(CONF_OUTPUT_DONE, &chan->conf_state); set_bit(CONF_OUTPUT_DONE, &chan->conf_state);
l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
l2cap_build_conf_rsp(chan, rsp, l2cap_build_conf_rsp(chan, rsp,
L2CAP_CONF_SUCCESS, 0x0000), rsp); L2CAP_CONF_SUCCESS, 0x0000), rsp);
} }
@@ -2856,7 +2855,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
set_bit(CONF_OUTPUT_DONE, &chan->conf_state); set_bit(CONF_OUTPUT_DONE, &chan->conf_state);
l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
l2cap_build_conf_rsp(chan, buf, l2cap_build_conf_rsp(chan, buf,
L2CAP_CONF_SUCCESS, 0x0000), buf); L2CAP_CONF_SUCCESS, 0x0000), buf);
} }
goto done; goto done;