Menu
▾
▴
CVS: 2 files have been modified in linux/drivers/char/bluetooth.
|
From: Peter K. <pk...@us...> - 2001-03-05 16:40:09
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.136 1.137=20=20=20=20=20=20=20=20=20=20=20
l2cap.c 1.90 1.91=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Code clean-up.
The diff of the modified file(s):
--- bluetooth.c 2001/03/05 15:52:52 1.136
+++ bluetooth.c 2001/03/05 16:41:44 1.137
@@ -1033,8 +1033,8 @@
/*************************************************************************=
****/
/* LINUX 2.0.X SPECIFIC CODE =
*/
/*************************************************************************=
****/
-static s32 bt_tty_read (struct tty_struct *tty, struct file *file, __u8 * =
buf,
- u32 nr)
+static s32 bt_tty_read(struct tty_struct *tty, struct file *file,
+ __u8 * buf, u32 nr)
#else
/*************************************************************************=
****/
/* LINUX 2.2.X SPECIFIC CODE =
*/
@@ -1894,7 +1894,7 @@
* Register the tty discipline
*/
=20=09
- (void) memset (&bt_ldisc, 0, sizeof (bt_ldisc));
+ memset(&bt_ldisc, 0, sizeof(bt_ldisc));
bt_ldisc.magic =3D TTY_LDISC_MAGIC;
bt_ldisc.open =3D bt_tty_open;
bt_ldisc.close =3D bt_tty_close;
@@ -2483,9 +2483,7 @@
=20=09
if ((SESSIONSTATE(line) =3D=3D BT_ACTIVE) ||=20
(SESSIONSTATE(line) =3D=3D BT_UPPERCONNECTED)) {
-=09
if (SESSIONSTATE(line) =3D=3D BT_ACTIVE) {
-=09=09=09
SESSIONSTATE(line) =3D BT_LOWERCONNECTED;
NBR_ACTIVE--;
}
--- l2cap.c 2001/03/05 16:39:35 1.90
+++ l2cap.c 2001/03/05 16:41:45 1.91
@@ -159,8 +159,7 @@
=20
const u8* psm2str(u16 psm)
{
- switch (psm)
- {
+ switch (psm) {
case 1:
return "SDP";
break;
@@ -190,7 +189,6 @@
}
}
=20
-
const u8* cmdrej_reason[] =3D {
"Command not understood",
"Signalling MTU exceeded",
@@ -516,7 +514,6 @@
PRINTPKT("l2cap_receive_data : ", data, len);
=20
if (*l2cap_len =3D=3D 0) {
-=09=09
/* Start of a new frame received,=20
parse header and set l2cap_len */
=20=09=09
@@ -536,9 +533,7 @@
/* check length */
if (!(pkt->len =3D=3D (len - L2CAP_HDRSIZE)))
return;
-
} else if (len !=3D *l2cap_len) {
-
/* Not recieved full frame yet or BIG packet */
=20=09=09
if (len > *l2cap_len) {
@@ -553,7 +548,6 @@
=20
switch (pkt->cid) {
case CIDSIG:
-=09
/* Signalling channel */
D_RCV("l2cap_receive_data : Signal data !\n");
=20=09=09
@@ -562,7 +556,6 @@
break;
=20=20=20=20=20
case CIDRCVCONLESS:
-
if (!l2cap->allow_conless) {
D_WARN("Connection less data not allowed\n");
return;
@@ -579,7 +572,6 @@
break;
=20=20=20=20=20
default:
-=09=09
/* Data channel */
con =3D get_lcon(pkt->cid);
=20=20=20=20=20
@@ -624,7 +616,6 @@
}=20=20
=20
while (pos < len) {
-=20=20=20=20
D_RCV(FNC"got packet (%d bytes) with ID : %d\n",
cmd->len, cmd->id);
=20=20=20=20=20
@@ -662,9 +653,7 @@
(used to detect corrupt packets) */
=20
switch (req->code) {
-=09=09
- case SIG_CONREQ: {
-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
+ case SIG_CONREQ:
/* Request for connection */
conreq =3D (sig_conreq *)req->data;
=20=09=09
@@ -718,20 +707,16 @@
#else
l2ca_connect_ind(con);
#endif
-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
- }
break; /* SIG_CONREQ*/
-=09
- case SIG_CONFREQ: {
=20
+ case SIG_CONFREQ:
/* Request for configuration */
confreq =3D (sig_confreq *)req->data;
=20=09=09
D_STATE(FNC"config request cid:%d flags: 0x%x\n",=20
confreq->dst_cid, confreq->flags);
=20=09=09
- if ((con =3D get_lcon(confreq->dst_cid)) =3D=3D NULL)
- {
+ if ((con =3D get_lcon(confreq->dst_cid)) =3D=3D NULL) {
D_ERR("Couldn't find local CID\n");
/* send back response ? */
l2cap_cmdrej(con->hci_hdl, CMDREJ_INVALIDCID, NULL, 0);
@@ -739,16 +724,12 @@
}
=20=09=09
switch (con->current_state) {
-
case CLOSED:
-
/* FIXME - send peer=20
'l2cap_config_rsp_neg' */
-=09=09=20=20
break;
=20=09=09=09
- case CONFIG:
- {
+ case CONFIG: {
s32 result =3D CONF_SUCCESS;
/* Parse remote options and store it in con */
=20
@@ -758,7 +739,6 @@
}
=20
if (result !=3D CONF_SUCCESS) {
-=09=09=09=09
/* we didn't like the options... */
DSYS("parse_options failed, send neg rsp\n");
=20
@@ -772,11 +752,10 @@
con->sig_id_rcv =3D req->id;
=20
l2ca_config_ind(con);=20=20=20=20=20=20=20=20=20=20=20
- }
break;
+ }
=20=09=09
- case OPEN:
- {=09
+ case OPEN: {=09
s32 result =3D CONF_SUCCESS;
=20
/*=20
@@ -817,8 +796,8 @@
con->conf_req_ready=3DFALSE;
=20=09=09=09
l2ca_config_ind(con);
- }
break;
+ }
=20=20=20=20=20=20=20=20=20=20=20=20
default:
D_ERR("Got config req in invalid state! [%s]\n",
@@ -826,11 +805,9 @@
PRINTSTATE(con);
break;
}=20=20
- }=20=20=20=20=20=20=20=20
break; /* SIG_CONFREQ*/
-=09=09=09
- case SIG_DISCREQ: {
=20=20=20=20=20=20=20=20=20=20
+ case SIG_DISCREQ:
discreq =3D (sig_discreq *)req->data;
=20
D_STATE(FNC"disconnection request id %d\n",=20
@@ -857,7 +834,6 @@
PRINTSTATE(con);
=20=20=20=20=20=20=20=20=20=20
l2ca_disconnect_ind(con);=20=20=20=20=20=20=20=20=20=20
- }=20
break; /* SIG_DISCREQ */
=20=20=20=20=20=20=20=20
case SIG_ECHOREQ: {
@@ -868,8 +844,8 @@
=20
l2cap_echo_rsp(hci_handle, req->id,=20
req->data, req->len- sizeof(sig_echo_pkt));
- }
break;
+ }
=20=20=20=20=20=20=20=20
case SIG_INFOREQ: {
/* Implementation specific */
@@ -879,33 +855,30 @@
info =3D (sig_info_req*)(req->data);
=20=09=09
switch(info->type) {
-
case INFO_CONNLESS_MTU:
DSYS("Request for connectionless MTU\n");
=20=09=09=09
l2cap_info_rsp(hci_handle, req->id, info->type,
NULL, 0, 1 /* not supported */);
-=09=09=09
break;
+
default:
D_ERR("Unknown info request : type 0x%x\n", info->type);
l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD,
NULL, 0);
break;=09=09
}
- }=20=20=20=20
break;
+ }=20=20=20=20
=20=20=20=20=20=20=20=20
case SIG_RESERVED:
D_STATE(FNC"Reserved !\n");
break;
=20=20=20=20=20=20=20=20=20
- default: {
+ default:
/* Not a valid command */
DSYS(FNC"Invalid command (code 0x%x)s\n", req->code);
- l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD,
- NULL, 0);
- }
+ l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD, NULL, 0);
break;
}
#undef FNC
@@ -932,8 +905,7 @@
(used to detect corrupt packets) */
=20
switch (rsp->code) {
- case SIG_CMDREJECT: {
-
+ case SIG_CMDREJECT:
D_STATE(FNC"Command reject - \n");
=20=20=20=20=20=20=20=20=20=20
cmdreject =3D (sig_cmdreject*)rsp->data;
@@ -959,11 +931,9 @@
if (opt_len > 0)
print_data(FNC"optional data : ",=20
cmdreject->data, rsp->len-2);
- }
break;
=20=20=20=20=20=20=20=20
- case SIG_CONRSP: {=20
-
+ case SIG_CONRSP:
/* client */
D_STATE(FNC"Got connection response\n");
conrsp =3D (sig_conrsp *)rsp->data;
@@ -987,7 +957,6 @@
#endif
=20
switch (conrsp->result) {
-
case RES_SUCCESS:
ENTERSTATE(con, CONFIG);
PRINTSTATE(con);
@@ -1028,7 +997,6 @@
}
=20=20=20=20=20=20=20=20=20=20
if (failure) {
-
/* Connection refused=20
FIXME -
Disable RTX/ERTX timers
@@ -1044,11 +1012,9 @@
ENTERSTATE(con, CLOSED);
delete_con(con);
}
- }=20=20=20=20=20=20
break;
=20=20=20=20=20=20=20=20
- case SIG_CONFRSP: {
-
+ case SIG_CONFRSP:
D_STATE(FNC"Got configuration response\n");
confrsp =3D (sig_confrsp *)rsp->data;
opt_len =3D rsp->len - sizeof(sig_confrsp);
@@ -1072,9 +1038,7 @@
}
=20
switch (confrsp->result) {
-=09
case CONF_SUCCESS:
-=20=20=20=20=20=20=20=20=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
#endif
@@ -1085,14 +1049,11 @@
=20=20=20=20=20=20=20=20=20=20=20=20
con->conf_req_ready =3D TRUE;
=20
- if (!con->conf_rsp_ready)
- {
+ if (!con->conf_rsp_ready) {
/* Upper layers still haven't replied pos */
DSYS("Still haven't replied pos on other sides conf req\n");
return ;
- }
- else {=09=09=09=09
-=09=09=09=09
+ } else {=09=09=09=09
ENTERSTATE(con, OPEN);
PRINTSTATE(con);
DSYS("l2cap channel (%d,%d) [%s] connected\n",=20
@@ -1122,7 +1083,6 @@
break;
}
=20=20=20=20=20=20
-
/* If we end up here, config failed */
=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1144,12 +1104,9 @@
/* For now we simply disconnect if params failed */
l2ca_config_cfm(con, confrsp->result);
l2ca_disconnect_req(con);
-
- }
break;
=20=20=20=20=20=20=20=20=20
- case SIG_DISCRSP: {
-=09
+ case SIG_DISCRSP:
D_STATE(FNC"Got disconnect response\n");
discrsp =3D (sig_discrsp *)rsp->data;
PRINTPKT(FNC"disconnect response", rsp->data, rsp->len);
@@ -1175,8 +1132,6 @@
#endif=09
=20
l2ca_disconnect_cfm(con);
-
- }
break;
=20=20=20=20=20=20=20=20
case SIG_ECHORSP: {=20
@@ -1207,23 +1162,18 @@
printk("DO NOT disconnect after doing ping...\n");
//lp_disconnect(hci_handle);
}
- }=20=20=20=20
break;
+ }=20=20=20=20
=20=20=20=20=20=20=20=20
- case SIG_INFORSP: {=20=20
+ case SIG_INFORSP:
info =3D (sig_info_rsp *)(rsp->data);
D_STATE(FNC"Got info response : result %d\n", info->result);
- }=20=20=20=20
break;
-=20=20=20=20=20=20=20
- default: {
=20=20=20=20=20=20=20=20=20
+ default:
/* Not a valid command */
DSYS(FNC"Invalid command 0x%x\n", rsp->code);
- l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD,
- NULL, 0);
- }
-=20=20=20=20=20=20=20
+ l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD, NULL, 0);
break;
}
=20=09
@@ -1330,7 +1280,6 @@
}
=20=09
if (status =3D=3D 0) {
-=09=09
/* pos cfm */
con->hci_hdl =3D con_hdl;
con->link_up =3D TRUE;
@@ -1353,11 +1302,9 @@
}
=20=09=09
if (!(con->initiator)) {=09=09
-=09=09=09
D_STATE("we are server\n");
/* now wait for a connection request */
} else {
-=09=09=09
D_STATE("we are client\n");
PRINTPKT("lp_connect_cfm : HCI connected to ",=20
bd_addr,6);
@@ -1379,7 +1326,6 @@
l2cap_connect_req(con, con->psm);
}
} else {
-=09=09=20
/* neg cfm */
D_STATE("lp_connect_cfm : (neg) %s\n",get_err_msg(status));
con->link_up =3D FALSE;
@@ -1416,7 +1362,6 @@
SHOW_LIST();
=20
while (((con =3D get_con_hcihdl(con_hdl)) !=3D NULL)) {
-
D_STATE("l2cap connection (%d:%d) found on handle %d\n",=20
con->local_cid, con->remote_cid, con_hdl);
D_STATE("now closing it...\n");
@@ -1474,7 +1419,6 @@
{=20=20
PRINTPKT("process_frame : ", data, len);
=20
-=09
if (len > (con->local_mtu)) {
DSYS("l2cap process_frame : len > local_mtu (%d/%d)\n",=20
len- L2CAP_HDRSIZE, con->local_mtu);
@@ -1483,7 +1427,6 @@
return;
}=20
=20
-=09
get_upper(con->psm)->receive_data(con, data, len);
}
=20
@@ -1524,7 +1467,6 @@
return -1;
}
=20=09
-
/* bd is big endian, reverse byte order to little endian */
for (i =3D 0;i<6;i++) {
rev_bd[5-i] =3D bd[i];
@@ -1559,7 +1501,6 @@
=20
/* if this physical bd link exist for another l2cap con, use that!*/
if (tmpcon) {
-
D_STATE("l2ca_connect_req : hci handle already exist.\n");
con->hci_hdl =3D tmpcon->hci_hdl;
con->link_up =3D 1;
@@ -1595,7 +1536,6 @@
/* should already be in CONFIG state */
=20
if (con->current_state =3D=3D CONFIG) {=20=20
-
/* local mtu is set in l2cap_config_req */
=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1606,14 +1546,12 @@
flush_timeout, link_to);=20=20
=20
} else if (con->current_state =3D=3D CLOSED) {
-
l2ca_config_cfm(con, CONF_REJ);
return -1;
} else if (con->current_state =3D=3D OPEN) {
-
printk("l2ca_config_req: state OPEN, reconfiguration !\n");
=20
- /* Fixme -=20
+ /* FIXME -=20
Is data automatically suspended while reconfiguring ?
*/
=20
@@ -1632,7 +1570,6 @@
flush_timeout, link_to);=20=20
return -1;
} else {
-
D_ERR("l2cap_config_req : invalid state\n");
PRINTSTATE(con);
return -1;
@@ -1696,18 +1633,13 @@
result =3D l2cap_connect_rsp(con, response, status);
=20=09
if (response =3D=3D RES_SUCCESS) {=20=20
-
ENTERSTATE(con, CONFIG);
PRINTSTATE(con);
-
}=20
else if (response =3D=3D RES_PENDING){
-=09=09
/* remain in */
-
}
else if (response >=3D RES_PSMNEG) {
-
/* 'l2ca_connect_rsp_neg()' */
ENTERSTATE(con, CLOSED);
PRINTSTATE(con);
@@ -1789,7 +1721,6 @@
SHOW_CON("disconnecting : ", con);
=20
if (con->current_state =3D=3D W4_L2CA_DISCONNECT_RSP) {
-
/* if we got a link down unexpectedly we cannot send=20
back a response, send nothing... */
if (con->link_up)
@@ -1910,7 +1841,6 @@
return hci_send_data(tx);
}
=20
-
/* only specify inparam if it differs from default value */
s32=20
l2cap_config_req(l2cap_con *con, u16 in_mtu, flow *outflow,
@@ -2074,7 +2004,6 @@
start_rtx(con, RTX_TIMEOUT);
#endif
return hci_send_data(tx);
-
}
=20
s32=20
@@ -2123,8 +2052,6 @@
return hci_send_data(tx);
}
=20
-
-
s32=20
l2cap_echo_rsp(s32 hci_hdl, s32 id, u8 *opt_data, s32 opt_len)
{
@@ -2307,8 +2234,7 @@
/****************************/
=20
s32=20
-l2cap_connect_rsp(l2cap_con* con, u16 response,=20
- u16 status)
+l2cap_connect_rsp(l2cap_con* con, u16 response, u16 status)
{
bt_tx_buf *tx;=20
l2cap_tx_buf *l2cap_buf; /* Entire l2cap frame + lower layer hdrs */
@@ -2338,8 +2264,7 @@
=20
if ((rsp->result =3D response) =3D=3D RES_PENDING)
rsp->status =3D status;
- else=20=20
- {
+ else {
printk("Result not pending, force status =3D no further info\n");
rsp->status =3D STAT_NOINFO;
}
@@ -2356,11 +2281,10 @@
tx->cur_len =3D L2CAP_HDRSIZE + payload_len; /* Increased when lower
layers add header data */
return hci_send_data(tx);=20=20
-};
+}
=20=20
s32=20
-l2cap_config_rsp(l2cap_con* con, u32 out_mtu,=20
- flow *in_flow)
+l2cap_config_rsp(l2cap_con* con, u32 out_mtu, flow *in_flow)
{
bt_tx_buf *tx;=20
l2cap_tx_buf *l2cap_buf; /* Entire l2cap frame + lower layer hdrs */
@@ -2371,8 +2295,7 @@
D_XMIT("l2cap_config_rsp : rcid : %d, out_mtu: %d \n",=20
con->remote_cid, out_mtu);
#if 0
- if (result !=3D RES_SUCCESS)
- {
+ if (result !=3D RES_SUCCESS) {
/* FIXME -- send back negative response */
DSYS("FIXME !!!!!!!!!!!!!!!!!!!!!!!! neg config rsp\n");
}
@@ -2413,8 +2336,7 @@
layers add header data */
PRINTPKT("config rsp : ", l2cap_buf, L2CAP_HDRSIZE + payload_len);
return hci_send_data(tx);
-
-};
+}
=20
s32=20
l2cap_disconnect_rsp(l2cap_con* con /*FIXME - , u16 status*/)
@@ -2469,14 +2391,12 @@
D_XMIT("l2cap_send_data : hdl : %d, rcid : %d, len:%d \n",
con->hci_hdl, con->remote_cid, tx->cur_len);
=20=09
- if (PARANOIA_CHECKCON(con))
- {
+ if (PARANOIA_CHECKCON(con)) {
D_ERR("%s l.%d NULL/magic failed\n", __FILE__, __LINE__);
return -1;
}
=20
- if (tx->cur_len > con->remote_mtu)
- {
+ if (tx->cur_len > con->remote_mtu) {
D_ERR("%s tries to send more than remote mtu, ignore\n",=20
psm2str(con->psm));
=20=09=20=20=20=20
@@ -2487,8 +2407,7 @@
}
=20
/* Only send on an OPEN channel */
- if (con->current_state!=3DOPEN)
- {
+ if (con->current_state !=3D OPEN) {
D_ERR("l2cap_send_data : not in open state\n");
D_ERR("SETTING FLUSHED ON THIS BUFFER !!!\n");
tx->flushed=3D1;
@@ -2522,7 +2441,6 @@
D_STATE("l2ca_connect_ind : remote cid : %d psm 0x%x\n",=20
con->remote_cid, con->psm);
=20
-
if (get_upper(con->psm) =3D=3D &default_protocol) {
D_STATE("l2ca_connect_ind : PSM not registered\n");
l2ca_connect_rsp(con, RES_PSMNEG, STAT_NOINFO);
@@ -2546,7 +2464,6 @@
get_upper(con->psm)->con_pnd(con, status);=20
}
=20
-
void=20
l2ca_connect_cfm(l2cap_con *con, s32 result)
{
@@ -2561,7 +2478,6 @@
get_upper(con->psm)->con_cfm(con, result);=20
}
=20
-
void=20
l2ca_config_ind(l2cap_con* con)
{=20=20
@@ -2570,7 +2486,6 @@
get_upper(con->psm)->conf_ind(con);=20
}
=20
-
/* according to spec this could be sent to upper layers after=20
receiving a config req but some stacks send their conf req=20
before sending their response we don't send cfm upwards
@@ -2627,8 +2542,6 @@
#endif
}
=20
-=20
-
s32 l2ca_ping(BD_ADDR bd)
{
l2cap_con *con;
@@ -2646,13 +2559,11 @@
=20=09
con =3D get_con(rev_bd, ANY_STATE);
=20
- if (!con)
- {
+ if (!con) {
D_STATE("l2ca_ping : create new baseband link\n");
con =3D create_con(0/* not yet set */,=20
get_cid(), 0/* not yet set */);
- if (con =3D=3D NULL)
- {
+ if (con =3D=3D NULL) {
D_ERR("l2ca_ping : no connection created");
return -1;
}
@@ -2664,9 +2575,7 @@
insert_con(con);
/* l2cap_echo_req is called in lp_connect_cfm */
return lp_connect_req(con->remote_bd);
- }
- else
- {
+ } else {
/* use existing handle */
D_STATE("l2ca_ping : using existing handle\n");
con->ping_sent=3D1;
@@ -2709,13 +2618,11 @@
=20=09
con =3D get_con(rev_bd, ANY_STATE);
=20
- if (!con)
- {
+ if (!con) {
D_STATE("l2ca_getinfo : create new baseband link\n");
con =3D create_con(0/* not yet set */,=20
get_cid(), 0/* not yet set */);
- if (con =3D=3D NULL)
- {
+ if (con =3D=3D NULL) {
D_ERR("l2ca_getinfo : no connection created");
return -1;
}
@@ -2730,9 +2637,7 @@
#endif
/* l2cap_echo_req is called in lp_connect_cfm */
return lp_connect_req(con->remote_bd);
- }
- else
- {
+ } else {
/* use existing handle */
D_STATE("l2ca_getinfo : using existing handle\n");
con->inforeq_sent =3D 1;
@@ -2782,12 +2687,10 @@
=20=20
// return;
=20=20=20
- if (timer_cancelled)
- {
+ if (timer_cancelled) {
D_TIM("RTX timer already cancelled\n");
return;
}
-
#endif
=20
/* do some paranoia checks */
@@ -2809,15 +2712,12 @@
=20=20=20
/* FIXME -- send l2ca_timeoutind() */
=20
- if (MAX_NO_RTX =3D=3D 0)
- {
+ if (MAX_NO_RTX =3D=3D 0) {
/* no retransmissions, shutdown connection */
printk("NO retransmissions, lets shutdown connection...\n");
l2ca_disconnect_req(con);
return;
- }=20=20
- else if (con->last_cmd.nbr_resends =3D=3D MAX_NO_RTX)
- {
+ } else if (con->last_cmd.nbr_resends =3D=3D MAX_NO_RTX) {
/* notify upper layers that link is going down */
=20=09=20=20
/* FIXME l2ca_disconnect_ind */
@@ -2835,7 +2735,6 @@
=20
/* now resend command */
switch(con->last_cmd.type) {
-
case SIG_CONREQ:
D_TIM("resending connection request\n");
l2cap_connect_req(con, con->psm);
@@ -2864,7 +2763,6 @@
case SIG_INFOREQ:
/* FIXME */
D_TIM("resending echo request NOT\n");
-=09=20=20
break;
=20=20=20
default:
@@ -2897,10 +2795,8 @@
printk("use NO timer...\n");
return;
#else
-
struct itimerval t =3D {{0,0},{timeout, 0}};
=20=20=20
-=20=20
D_TIM("Starting RTX timer (%d sec)\n", timeout);
=20
if (timeout_con)
@@ -2999,7 +2895,6 @@
opt =3D (l2cap_option*)(data + pos);
switch (opt->type) {
case OPT_MTU:
-
con->remote_mtu =3D *((u16*)opt->option_data);
=20
if ((con->remote_mtu < MTU_MIN) &&=20
@@ -3017,11 +2912,9 @@
con->local_cid, con->remote_cid,=20
con->remote_mtu);
found_option =3D 1;
-=09=09=09
break;
=20=20=20=20=20=20=20
case OPT_FLUSH:
-
con->flush_timeout =3D *((u16*)opt->option_data);
=20
/* FIXME -- return error code if not accepted */
@@ -3035,7 +2928,6 @@
break;
=20=20=20=20=20=20=20
case OPT_QOS:
-
memcpy((u8*)&con->remote_qos, opt->option_data,=20
sizeof(struct flow));
=20=09=09=09
@@ -3089,7 +2981,6 @@
return l2cap->id_count++;
};
=20
-
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -=
- */
=20
s32 l2cap_sprint_bd(u8 *buf, BD_ADDR bd)=20
@@ -3128,7 +3019,6 @@
printk("NULL !\n");
return;
} else {
-=09=09
printk("flow:\n");
printk("flags:%d service:%d token_rate:%d\n",
f->flags, f->service, (int) f->token_rate);
|
