aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-11-01 12:06:23 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-07 14:24:44 -0500
commit3e6b3b95f26e1253cd429cf949b9c41598ba3033 (patch)
tree263cbafe73a9057e006bd78a9409cc746daf2363 /net
parent0e8b207e8a4442f1a662e1a3827e61e40279630a (diff)
Bluetooth: small styles clean ups to l2cap_core.c
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c12d3bf08a42..7d663bd3bc5d 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2237,11 +2237,10 @@ done:
2237 return -ECONNREFUSED; 2237 return -ECONNREFUSED;
2238 2238
2239 l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, 2239 l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
2240 sizeof(efs), 2240 sizeof(efs),
2241 (unsigned long) &efs); 2241 (unsigned long) &efs);
2242 } else { 2242 } else {
2243 /* Send PENDING Conf Rsp and mark state 2243 /* Send PENDING Conf Rsp */
2244 local PENDING */
2245 result = L2CAP_CONF_PENDING; 2244 result = L2CAP_CONF_PENDING;
2246 set_bit(CONF_LOC_CONF_PEND, &chan->conf_state); 2245 set_bit(CONF_LOC_CONF_PEND, &chan->conf_state);
2247 } 2246 }
@@ -2373,8 +2372,8 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
2373 case L2CAP_CONF_EWS: 2372 case L2CAP_CONF_EWS:
2374 chan->tx_win = min_t(u16, val, 2373 chan->tx_win = min_t(u16, val,
2375 L2CAP_DEFAULT_EXT_WINDOW); 2374 L2CAP_DEFAULT_EXT_WINDOW);
2376 l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2375 l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
2377 2, chan->tx_win); 2376 chan->tx_win);
2378 break; 2377 break;
2379 } 2378 }
2380 } 2379 }
@@ -2801,7 +2800,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
2801 set_bit(CONF_OUTPUT_DONE, &chan->conf_state); 2800 set_bit(CONF_OUTPUT_DONE, &chan->conf_state);
2802 2801
2803 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, 2802 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
2804 l2cap_build_conf_rsp(chan, rsp, 2803 l2cap_build_conf_rsp(chan, rsp,
2805 L2CAP_CONF_SUCCESS, 0x0000), rsp); 2804 L2CAP_CONF_SUCCESS, 0x0000), rsp);
2806 } 2805 }
2807 2806
@@ -2856,7 +2855,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
2856 set_bit(CONF_OUTPUT_DONE, &chan->conf_state); 2855 set_bit(CONF_OUTPUT_DONE, &chan->conf_state);
2857 2856
2858 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, 2857 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
2859 l2cap_build_conf_rsp(chan, buf, 2858 l2cap_build_conf_rsp(chan, buf,
2860 L2CAP_CONF_SUCCESS, 0x0000), buf); 2859 L2CAP_CONF_SUCCESS, 0x0000), buf);
2861 } 2860 }
2862 goto done; 2861 goto done;