Merge pull request #12577 from yuwata/test-network-issue-12344

test-network: fix test_bond_operstate
This commit is contained in:
Yu Watanabe
2019-05-19 09:26:14 +09:00
committed by GitHub
2 changed files with 240 additions and 283 deletions

View File

@@ -1637,7 +1637,8 @@ bool link_has_carrier(Link *link) {
if (link->kernel_operstate == IF_OPER_UNKNOWN)
/* operstate may not be implemented, so fall back to flags */
if ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT))
if (FLAGS_SET(link->flags, IFF_LOWER_UP | IFF_RUNNING) &&
!FLAGS_SET(link->flags, IFF_DORMANT))
return true;
return false;

File diff suppressed because it is too large Load Diff