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: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index 0b4c8a7396bc934d0c0a15ada3e944d313aae29c..ce9b05b9e93a93ab6974ddf714a28fa3867299b3 100644 (file)
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -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 || ctr->state != CAPI_CTR_RUNNING)
+               return CAPI_REGNOTINSTALLED;
        if (ctr->blocked)
                return CAPI_SENDQUEUEFULL;