diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-11-19 18:38:13 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-11-19 18:39:08 -0600 |
| commit | 5de8a0d3a711d7e9b0fab790964f55f40be99292 (patch) | |
| tree | 6f576fd07946a26a8f3e20e8323729e337771170 | |
| parent | 5338178d8161a2f37d756896be43859b3b86ff3e (diff) | |
| download | NetworkManager-5de8a0d3a711d7e9b0fab790964f55f40be99292.tar.gz | |
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
| -rw-r--r-- | src/platform/nm-linux-platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |