diff options
author | Tilman Schmidt <tilman@imap.cc> | 2012-04-25 09:02:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-07 22:37:56 -0400 |
commit | 62a1cfe052346b96a552b6a9178d412c709711bb (patch) | |
tree | 2230cd1ecc1db46c0df433318e3cd0fd8bd8ba68 /drivers/isdn | |
parent | 8e618aad5348b6e6c5a90e8d97ea643197963b20 (diff) |
isdn/gigaset: fix CAPI disconnect B3 handling
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>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/gigaset/capi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c index 292ca2fc852c..579aa021a659 100644 --- a/drivers/isdn/gigaset/capi.c +++ b/drivers/isdn/gigaset/capi.c | |||
@@ -1887,6 +1887,9 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif, | |||
1887 | 1887 | ||
1888 | /* check for active logical connection */ | 1888 | /* check for active logical connection */ |
1889 | if (bcs->apconnstate >= APCONN_ACTIVE) { | 1889 | if (bcs->apconnstate >= APCONN_ACTIVE) { |
1890 | /* clear it */ | ||
1891 | bcs->apconnstate = APCONN_SETUP; | ||
1892 | |||
1890 | /* | 1893 | /* |
1891 | * emit DISCONNECT_B3_IND with cause 0x3301 | 1894 | * emit DISCONNECT_B3_IND with cause 0x3301 |
1892 | * use separate cmsg structure, as the content of iif->acmsg | 1895 | * use separate cmsg structure, as the content of iif->acmsg |
@@ -1911,6 +1914,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif, | |||
1911 | } | 1914 | } |
1912 | capi_cmsg2message(b3cmsg, | 1915 | capi_cmsg2message(b3cmsg, |
1913 | __skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN)); | 1916 | __skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN)); |
1917 | dump_cmsg(DEBUG_CMD, __func__, b3cmsg); | ||
1914 | kfree(b3cmsg); | 1918 | kfree(b3cmsg); |
1915 | capi_ctr_handle_message(&iif->ctr, ap->id, b3skb); | 1919 | capi_ctr_handle_message(&iif->ctr, ap->id, b3skb); |
1916 | } | 1920 | } |