diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-18 09:42:11 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-18 09:42:11 +0000 |
| commit | eb3365561ffe384772c58c40a0a8f24ab796dd41 (patch) | |
| tree | 9610cb64b16d991a99558b97bc8c1113c3095914 /net/core | |
| parent | a5b253b55d22f8845a6450001c408d93c8baeeeb (diff) | |
| parent | c15b830f7c1cafd34035a46485716933f66ab753 (diff) | |
Merge tag 'v5.4.142' into 5.4-2.3.x-imx
This is the 5.4.142 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/link_watch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index f153e0601838..35b0e39030da 100644 --- a/net/core/link_watch.c +++ b/net/core/link_watch.c @@ -150,7 +150,7 @@ static void linkwatch_do_dev(struct net_device *dev) clear_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state); rfc2863_policy(dev); - if (dev->flags & IFF_UP && netif_device_present(dev)) { + if (dev->flags & IFF_UP) { if (netif_carrier_ok(dev)) dev_activate(dev); else @@ -196,7 +196,8 @@ static void __linkwatch_run_queue(int urgent_only) dev = list_first_entry(&wrk, struct net_device, link_watch_list); list_del_init(&dev->link_watch_list); - if (urgent_only && !linkwatch_urgent_event(dev)) { + if (!netif_device_present(dev) || + (urgent_only && !linkwatch_urgent_event(dev))) { list_add_tail(&dev->link_watch_list, &lweventlist); continue; } |