Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 07:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

isdn/gigaset: fix CAPI disconnect B3 handling

Browse Source 
If DISCONNECT_B3_IND was synthesized because of a DISCONNECT_REQ
with existing logical connections, the connection state wasn't
updated accordingly. Also the emitted DISCONNECT_B3_IND message
wasn't included in the debug log as requested.
This patch fixes both of these issues.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
CC: stable <stable@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tilman Schmidt 2012-04-25 13:02:20 +00:00 committed by David S. Miller
parent 8e618aad53
commit 62a1cfe052
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/isdn/gigaset/capi.c
View File

@ -1887,6 +1887,9 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
/* check for active logical connection */ /* check for active logical connection */
if (bcs->apconnstate >= APCONN_ACTIVE) { if (bcs->apconnstate >= APCONN_ACTIVE) {
/* clear it */
bcs->apconnstate = APCONN_SETUP;
/* /*
* emit DISCONNECT_B3_IND with cause 0x3301 * emit DISCONNECT_B3_IND with cause 0x3301
* use separate cmsg structure, as the content of iif->acmsg * use separate cmsg structure, as the content of iif->acmsg
@ -1911,6 +1914,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
} }
capi_cmsg2message(b3cmsg, capi_cmsg2message(b3cmsg,
__skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN)); __skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN));
dump_cmsg(DEBUG_CMD, __func__, b3cmsg);
kfree(b3cmsg); kfree(b3cmsg);
capi_ctr_handle_message(&iif->ctr, ap->id, b3skb); capi_ctr_handle_message(&iif->ctr, ap->id, b3skb);
} }