diff options
| author | Michael Biebl <biebl@debian.org> | 2022-05-04 15:38:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-05-04 15:38:03 +0200 |
| commit | fc1f1b6881ed5199b4cc81face915769a3dc9897 (patch) | |
| tree | d2b3f6b775541cece8de7ef9e687c72665f5d820 /src/core/devices/nm-device-tun.c | |
| parent | 16cc38ed3d1761b178512c9a6c291ad366c6fad8 (diff) | |
| parent | 9959fdb2e8ddd06f2161798ca0a39c77d67c652d (diff) | |
Update upstream source from tag 'upstream/1.37.92'
Update to upstream version '1.37.92' with Debian dir 0128b715b1fc3e516169a4599c33567587d59088
Diffstat (limited to 'src/core/devices/nm-device-tun.c')
| -rw-r--r-- | src/core/devices/nm-device-tun.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c index b6c4f88b..e623e9c0 100644 --- a/src/core/devices/nm-device-tun.c +++ b/src/core/devices/nm-device-tun.c @@ -542,6 +542,12 @@ create_device(NMDeviceFactory *factory, NM_SETTING_TUN_SETTING_NAME), NULL); + /* OpenvSwitch will create a tun device named ovs-netdev when the datapath selected is netdev */ + if (nm_streq0(iface, "ovs-netdev")) { + *out_ignore = TRUE; + return NULL; + } + return g_object_new(NM_TYPE_DEVICE_TUN, NM_DEVICE_IFACE, iface, |