This reverts commit 124eee3f6955f7aa19b9e6ff5c9b6d37cb3d1e2c.
Inami-san reported that this commit breaks bridge support in a Xen
environment, and that reverting it fixes this.
During system resume, bridge ports are no longer enabled, as that relies
on the receipt of the NETDEV_CHANGE notification. This notification is
not sent, as netdev_state_change() is no longer called.
Note that the condition this commit intended to fix never existed
upstream, as the patch triggering it and referenced in the commit was
never applied upstream. Hence I can confirm s2ram on r8a73a4/ape6evm
and sh73a0/kzm9g works fine before/after this revert.
Reported-by Gaku Inami <gaku.inami...@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be>
---
net/core/link_watch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 75431ca9300fb9c4..c24574493ecf95e6 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -158,7 +158,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
--
2.17.1
