automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@50516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Automerge Script 19 years ago
parent fa061fa339
commit 0517ed834e

@ -1966,6 +1966,8 @@ handle_event_nt(void *dat, void *arg)
cb_event(EVENT_PORT_ALARM, &stack->bc[0], glob_mgr->user_data);
}
/* when we get the L2 UP, the L1 is UP definitely too*/
stack->l1link = 1;
stack->l2link = 1;
stack->l2upcnt=0;
@ -2812,6 +2814,9 @@ int handle_mgmt(msg_t *msg)
case SSTATUS_L2_ESTABLISHED:
cb_log(3, stack->port, "MGMT: SSTATUS: L2_ESTABLISH \n");
/*when the L2 goes UP, L1 needs to be UP too*/
stack->l1link=1;
stack->l2link=1;
if ( !stack->ptp && !stack->nt )
stack->l1link=2;

Loading…
Cancel
Save