fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 11:40:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: ignore ovs-system master when assuming connections

Browse source 
This change allows NM to assume after a restart a device that has been
enslaved externally to an ovs bridge.

https://bugzilla.redhat.com/show_bug.cgi?id=1676551
(cherry picked from commit 93bbe43695)
(cherry picked from commit 526f1476db)
(cherry picked from commit 87c2a8339f)
This commit is contained in:
Beniamino Galvani 2019-02-26 10:07:36 +01:00
parent 2c2cbf89d4
commit a45ab9a3fb
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nm-manager.c
View file

@ -2405,7 +2405,12 @@ get_existing_connection (NMManager *self,
if (ifindex) {
int master_ifindex = nm_platform_link_get_master (priv->platform, ifindex);
if (master_ifindex) {
/* Check that the master is activating before assuming a
* slave connection. However, ignore ovs-system master as
* we never manage it.
*/
if ( master_ifindex
&& nm_platform_link_get_type (priv->platform, master_ifindex) != NM_LINK_TYPE_OPENVSWITCH) {
master = nm_manager_get_device_by_ifindex (self, master_ifindex);
if (!master) {
_LOG2D (LOGD_DEVICE, device, "assume: don't assume because "