From 5de8a0d3a711d7e9b0fab790964f55f40be99292 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 19 Nov 2014 18:38:13 -0600 Subject: [PATCH] platform: stop using private kernel tun device flags (bgo #740380) The TUN_* flags are going to be deprecated upstream in the kernel so we might as well stop using them. https://lkml.org/lkml/2014/11/19/460 https://bugzilla.gnome.org/show_bug.cgi?id=740380 --- src/platform/nm-linux-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 42444d97e8..391f1758db 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2964,7 +2964,7 @@ tun_get_properties (NMPlatform *platform, int ifindex, NMPlatformTunProperties * #ifndef IFF_MULTI_QUEUE const int IFF_MULTI_QUEUE = 0x0100; #endif - props->mode = ((flags & TUN_TYPE_MASK) == TUN_TUN_DEV) ? "tun" : "tap"; + props->mode = ((flags & (IFF_TUN | IFF_TAP)) == IFF_TUN) ? "tun" : "tap"; props->no_pi = !!(flags & IFF_NO_PI); props->vnet_hdr = !!(flags & IFF_VNET_HDR); props->multi_queue = !!(flags & IFF_MULTI_QUEUE);