diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-09-05 17:34:01 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-09-05 17:34:01 +0200 |
| commit | 58e7337182c29ac7acfd713254fd770f5b8a99f5 (patch) | |
| tree | 72b7cd01fbb13ad88e76cf301e285b06290e89b0 | |
| parent | e1969e40ae8da0d01804ebd6a11594635b1dbd35 (diff) | |
testmelr/testme
| -rw-r--r-- | src/core/nm-manager.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index b6b8b0b842..d8629f5daa 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -4616,11 +4616,16 @@ ensure_master_active_connection(NMManager *self, NULL)) continue; +#if 0 if (!nm_device_is_software(candidate)) { master_state = nm_device_get_state(candidate); if (nm_device_is_real(candidate) && master_state != NM_DEVICE_STATE_DISCONNECTED) continue; } +#else + if (nm_device_is_real(candidate) && nm_device_get_state(candidate) != NM_DEVICE_STATE_DISCONNECTED) + continue; +#endif master_ac = nm_manager_activate_connection( self, |