diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2010-02-08 10:12:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 16:01:35 -0800 |
| commit | c6af0437941c92179eeb51579f19423eacc5516c (patch) | |
| tree | 0d67339dc151979cbda683d944ba102d83b18b4f | |
| parent | eef0ced02840cdbc9045b24e73378401aae04d4c (diff) | |
| download | kernel_goldelico_gta04-c6af0437941c92179eeb51579f19423eacc5516c.zip kernel_goldelico_gta04-c6af0437941c92179eeb51579f19423eacc5516c.tar.gz kernel_goldelico_gta04-c6af0437941c92179eeb51579f19423eacc5516c.tar.bz2 | |
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>
| -rw-r--r-- | drivers/isdn/capi/kcapi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 0b4c8a7..ce9b05b 100644 --- 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; |