diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-08 10:09:28 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 10:09:28 -0300 |
| commit | 5b5a04065fb5487303869fd6080c30f86530005d (patch) | |
| tree | d1442504baf73be22d9e6bc1864206df5ccedfeb /drivers/net/wan/hdlc_ppp.c | |
| parent | 0e674a64b86e2bb00ab43f56104d3ea85dda0066 (diff) | |
| parent | 8d99753ad93af6bcaf798232eeb15e60bdd7e94b (diff) | |
Merge pull request #25 from MaxKrummenacher/4.9-1.0.x-imx-stable-merge
4.9 1.0.x imx stable merge
Diffstat (limited to 'drivers/net/wan/hdlc_ppp.c')
| -rw-r--r-- | drivers/net/wan/hdlc_ppp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index 47fdb87d3567..8a9aced850be 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -574,7 +574,10 @@ static void ppp_timer(unsigned long arg) ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0, 0, NULL); proto->restart_counter--; - } else + } else if (netif_carrier_ok(proto->dev)) + ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0, + 0, NULL); + else ppp_cp_event(proto->dev, proto->pid, TO_BAD, 0, 0, 0, NULL); break; |