Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62a1cfe0 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller
Browse files

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: default avatarTilman Schmidt <tilman@imap.cc>
CC: stable <stable@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e618aad

drivers/isdn/gigaset/capi.c

+4 −0
Original line number Diff line number Diff line
@@ -1887,6 +1887,9 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif, 


	/* check for active logical connection */

	if (bcs->apconnstate >= APCONN_ACTIVE) {

		/* clear it */

		bcs->apconnstate = APCONN_SETUP;



		/*

		 * emit DISCONNECT_B3_IND with cause 0x3301

		 * 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,

				  __skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN));

		dump_cmsg(DEBUG_CMD, __func__, b3cmsg);

		kfree(b3cmsg);

		capi_ctr_handle_message(&iif->ctr, ap->id, b3skb);

	}