diff options
| author | Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> | 2018-09-25 21:56:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-25 20:48:56 -0700 |
| commit | 94b6ddce71780575fbbf9d2c36afc8440e61a281 (patch) | |
| tree | 30b302300b0ddf583a6b1d0a517bcdca866bb5fb /net/tipc | |
| parent | 92ef12b32feab8f277b69e9fb89ede2796777f4d (diff) | |
| download | linux-94b6ddce71780575fbbf9d2c36afc8440e61a281.tar.gz linux-94b6ddce71780575fbbf9d2c36afc8440e61a281.tar.bz2 linux-94b6ddce71780575fbbf9d2c36afc8440e61a281.zip | |
tipc: reset bearer if device carrier not ok
If we detect that under lying carrier detects errors and goes down,
we reset the bearer.
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/bearer.c | 12 |
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); |