aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorAndreas Eversberg <andreas@eversberg.eu>2012-05-04 00:15:30 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-04 11:53:14 -0400
commit82107b73eae812d8c089832b14b24ffe20a5c241 (patch)
tree71f9aa15dea9fd37aa29cf5aa27e766c792953e3 /drivers/isdn
parent17045755193a93fbd2d97db9aad5e726fc8c2a6d (diff)
mISDN: Added PH_* state info to tei manager.
Tei manager reports current layer 1 state on creation. On state change it reports it to the socket interface. Signed-off-by: Andreas Eversberg <andreas@eversberg.eu> Signed-off-by: Karsten Keil <keil@b1-systems.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/mISDN/tei.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index ba2bc0c776e2..969766f5f82b 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -1023,6 +1023,8 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
1023 mgr->up = crq->ch; 1023 mgr->up = crq->ch;
1024 id = DL_INFO_L2_CONNECT; 1024 id = DL_INFO_L2_CONNECT;
1025 teiup_create(mgr, DL_INFORMATION_IND, sizeof(id), &id); 1025 teiup_create(mgr, DL_INFORMATION_IND, sizeof(id), &id);
1026 if (test_bit(MGR_PH_ACTIVE, &mgr->options))
1027 teiup_create(mgr, PH_ACTIVATE_IND, 0, NULL);
1026 crq->ch = NULL; 1028 crq->ch = NULL;
1027 if (!list_empty(&mgr->layer2)) { 1029 if (!list_empty(&mgr->layer2)) {
1028 read_lock_irqsave(&mgr->lock, flags); 1030 read_lock_irqsave(&mgr->lock, flags);
@@ -1096,12 +1098,16 @@ mgr_send(struct mISDNchannel *ch, struct sk_buff *skb)
1096 break; 1098 break;
1097 case PH_ACTIVATE_IND: 1099 case PH_ACTIVATE_IND:
1098 test_and_set_bit(MGR_PH_ACTIVE, &mgr->options); 1100 test_and_set_bit(MGR_PH_ACTIVE, &mgr->options);
1101 if (mgr->up)
1102 teiup_create(mgr, PH_ACTIVATE_IND, 0, NULL);
1099 mISDN_FsmEvent(&mgr->deact, EV_ACTIVATE_IND, NULL); 1103 mISDN_FsmEvent(&mgr->deact, EV_ACTIVATE_IND, NULL);
1100 do_send(mgr); 1104 do_send(mgr);
1101 ret = 0; 1105 ret = 0;
1102 break; 1106 break;
1103 case PH_DEACTIVATE_IND: 1107 case PH_DEACTIVATE_IND:
1104 test_and_clear_bit(MGR_PH_ACTIVE, &mgr->options); 1108 test_and_clear_bit(MGR_PH_ACTIVE, &mgr->options);
1109 if (mgr->up)
1110 teiup_create(mgr, PH_DEACTIVATE_IND, 0, NULL);
1105 mISDN_FsmEvent(&mgr->deact, EV_DEACTIVATE_IND, NULL); 1111 mISDN_FsmEvent(&mgr->deact, EV_DEACTIVATE_IND, NULL);
1106 ret = 0; 1112 ret = 0;
1107 break; 1113 break;