1 files changed, 7 insertions, 5 deletions

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 418f03d0be90..645c16052052 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -609,16 +609,18 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,
 
         switch (evt) {
         case NETDEV_CHANGE:
-                if (netif_carrier_ok(dev))
+                if (netif_carrier_ok(dev) && netif_oper_up(dev)) {
+                        test_and_set_bit_lock(0, &b->up);
                         break;
-                /* else: fall through */
-        case NETDEV_UP:
-                test_and_set_bit_lock(0, &b->up);
-                break;
+                }
+                /* fall through */
         case NETDEV_GOING_DOWN:
                 clear_bit_unlock(0, &b->up);
                 tipc_reset_bearer(net, b);
                 break;
+        case NETDEV_UP:
+                test_and_set_bit_lock(0, &b->up);
+                break;
         case NETDEV_CHANGEMTU:
                 if (tipc_mtu_bad(dev, 0)) {
                         bearer_disable(net, b);