From b5433097e288b9733c432005b2cf619b6457afce Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 22 Jan 2015 18:47:32 +0100 Subject: [PATCH] device: adjust default route metric for BRIDGE device type We forgot to include the BRIDGE, so that bridge devices got a default priority (route-metric) of 950 Add it between VLAN and MODEM type. Also return a different metric for UNKNOWN device types, but these priorities are not actually expected. (cherry picked from commit 8dce71be74a1c91ca96294c8b6a22bce6b38493e) --- src/devices/nm-device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 119d4a8..1c75790 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -692,6 +692,8 @@ nm_device_get_priority (NMDevice *self) return 350; case NM_DEVICE_TYPE_VLAN: return 400; + case NM_DEVICE_TYPE_BRIDGE: + return 425; case NM_DEVICE_TYPE_MODEM: return 450; case NM_DEVICE_TYPE_BT: @@ -700,9 +702,16 @@ nm_device_get_priority (NMDevice *self) return 600; case NM_DEVICE_TYPE_OLPC_MESH: return 650; - default: + case NM_DEVICE_TYPE_GENERIC: return 950; + case NM_DEVICE_TYPE_UNKNOWN: + return 10000; + case NM_DEVICE_TYPE_UNUSED1: + case NM_DEVICE_TYPE_UNUSED2: + /* omit default: to get compiler warning about missing switch cases */ + break; } + return 11000; } guint32 -- 1.9.3