diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 06:47:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 06:47:01 +0100 |
| commit | 73709e1af5163ebf5e9b0e18fe90b7e843657d36 (patch) | |
| tree | 91ca8b98187ba60e88f8df2e32147fdf651f159e /drivers/net/wan/hdlc_ppp.c | |
| parent | uapi: remove telephony headers (diff) | |
| parent | Linux 4.16-rc6 (diff) | |
| download | linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.tar.xz linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.zip | |
Merge 4.16-rc6 into staging-next
We want the staging fixes in here as well to handle merge/test issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 afeca6bcdade..ab8b3cbbb205 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -574,7 +574,10 @@ static void ppp_timer(struct timer_list *t) 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; |