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

Commit c6af0437 authored by Jan Kiszka's avatar Jan Kiszka Committed by David S. Miller
Browse files

CAPI: Drop special controller lookup from capi20_put_message 



This strange special rule to fall back to controller 1 cannot be derived
from the CAPI specs and looks a lot like it was once dedicated to some
out-of-tree driver, probably AVM's broken fcdsl2 (FRITZ!Card DSL v2.0).
I found no in-tree user that needs this check, and I'm now taking care
of the fcdsl2. So drop these bits from our stack.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@web.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eef0ced0

drivers/isdn/capi/kcapi.c

+2 −5
Original line number Diff line number Diff line
@@ -777,11 +777,8 @@ u16 capi20_put_message(struct capi20_appl *ap, struct sk_buff *skb) 
	 * synchronizes this service with capi20_release.

	 */

	ctr = get_capi_ctr_by_nr(CAPIMSG_CONTROLLER(skb->data));

	if (!ctr || ctr->state != CAPI_CTR_RUNNING) {

		ctr = get_capi_ctr_by_nr(1); /* XXX why? */

	if (!ctr || ctr->state != CAPI_CTR_RUNNING)

		return CAPI_REGNOTINSTALLED;

	}

	if (ctr->blocked)

		return CAPI_SENDQUEUEFULL;