i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed the build and ticket #3515 (multi-line string).

Browse Source 
* Automatic white space cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29383 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-03-03 08:53:47 +00:00
parent 11d36ea03d
commit 61252f516c
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/l2cap/l2cap_signal.cpp
+7 -4
View File
@@ -710,21 +710,24 @@ l2cap_process_discon_req(HciConnection* conn, uint8 ident, net_buffer* buffer)
/* Check if we have this channel and it is in valid state */ /* Check if we have this channel and it is in valid state */
ch = btCoreData->ChannelBySourceID(conn, dcid); ch = btCoreData->ChannelBySourceID(conn, dcid);
if (ch == NULL) { if (ch == NULL) {
debugf("unexpected L2CAP_DisconnectReq message.Channel does not exist, cid=%d\n", dcid); debugf("unexpected L2CAP_DisconnectReq message.Channel does not exist, "
"cid=%d\n", dcid);
goto reject; goto reject;
} }
/* XXX Verify channel state and reject if invalid -- is that true? */ /* XXX Verify channel state and reject if invalid -- is that true? */
if (ch->state != L2CAP_CHAN_OPEN && ch->state != L2CAP_CHAN_CONFIG && if (ch->state != L2CAP_CHAN_OPEN && ch->state != L2CAP_CHAN_CONFIG &&
ch->state != L2CAP_CHAN_W4_L2CAP_DISCON_RSP) { ch->state != L2CAP_CHAN_W4_L2CAP_DISCON_RSP) {
debugf("unexpected L2CAP_DisconnectReq. Invalid channel state, cid=%d, state=%d\n", dcid, ch->state); debugf("unexpected L2CAP_DisconnectReq. Invalid channel state, cid=%d, "
"state=%d\n", dcid, ch->state);
goto reject; goto reject;
} }
/* Match destination channel ID */ /* Match destination channel ID */
if (ch->dcid != scid || ch->scid != dcid) { if (ch->dcid != scid || ch->scid != dcid) {
debugf("unexpected L2CAP_DisconnectReq. Channel IDs does not match, channel: scid=%d, dcid=%d, debugf("unexpected L2CAP_DisconnectReq. Channel IDs does not match, "
request: scid=%d, dcid=%d\n", ch->scid, ch->dcid, scid, dcid); "channel: scid=%d, dcid=%d, request: scid=%d, dcid=%d\n",
ch->scid, ch->dcid, scid, dcid);
goto reject; goto reject;
} }