aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/stack.c
diff options
context:
space:
mode:
authorAndreas Eversberg <andreas@eversberg.eu>2008-09-14 06:30:18 -0400
committerKarsten Keil <kkeil@suse.de>2009-01-09 16:44:27 -0500
commit1b4d33121f1d991f6ae226cc3333428ff87627bb (patch)
tree48fef7c8a422087a15a03c025b7709a100498a5a /drivers/isdn/mISDN/stack.c
parent02282eee56b75a35e6bbc42cc34c9005eb1653f4 (diff)
mISDN: Fix deactivation, if peer IP is removed from l1oip instance.
Added GETPEER operation. Socket now checks if device is already busy at a differen mode. Signed-off-by: Andreas Eversberg <andreas@eversberg.eu> Signed-off-by: Karsten Keil <kkeil@suse.de>
Diffstat (limited to 'drivers/isdn/mISDN/stack.c')
-rw-r--r--drivers/isdn/mISDN/stack.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c
index 8cff570bb8df..63afa8cf9e07 100644
--- a/drivers/isdn/mISDN/stack.c
+++ b/drivers/isdn/mISDN/stack.c
@@ -440,15 +440,6 @@ connect_layer1(struct mISDNdevice *dev, struct mISDNchannel *ch,
440 case ISDN_P_NT_E1: 440 case ISDN_P_NT_E1:
441 case ISDN_P_TE_S0: 441 case ISDN_P_TE_S0:
442 case ISDN_P_TE_E1: 442 case ISDN_P_TE_E1:
443#ifdef PROTOCOL_CHECK
444 /* this should be enhanced */
445 if (!list_empty(&dev->D.st->layer2)
446 && dev->D.protocol != protocol)
447 return -EBUSY;
448 if (!hlist_empty(&dev->D.st->l1sock.head)
449 && dev->D.protocol != protocol)
450 return -EBUSY;
451#endif
452 ch->recv = mISDN_queue_message; 443 ch->recv = mISDN_queue_message;
453 ch->peer = &dev->D.st->own; 444 ch->peer = &dev->D.st->own;
454 ch->st = dev->D.st; 445 ch->st = dev->D.st;
@@ -546,15 +537,6 @@ create_l2entity(struct mISDNdevice *dev, struct mISDNchannel *ch,
546 if (dev->Dprotocols & (1 << ISDN_P_NT_E1)) 537 if (dev->Dprotocols & (1 << ISDN_P_NT_E1))
547 rq.protocol = ISDN_P_NT_E1; 538 rq.protocol = ISDN_P_NT_E1;
548 case ISDN_P_LAPD_TE: 539 case ISDN_P_LAPD_TE:
549#ifdef PROTOCOL_CHECK
550 /* this should be enhanced */
551 if (!list_empty(&dev->D.st->layer2)
552 && dev->D.protocol != protocol)
553 return -EBUSY;
554 if (!hlist_empty(&dev->D.st->l1sock.head)
555 && dev->D.protocol != protocol)
556 return -EBUSY;
557#endif
558 ch->recv = mISDN_queue_message; 540 ch->recv = mISDN_queue_message;
559 ch->peer = &dev->D.st->own; 541 ch->peer = &dev->D.st->own;
560 ch->st = dev->D.st; 542 ch->st = dev->D.st;