fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 11:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: adjust default route metric for BRIDGE device type

Browse source 
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 8dce71be74)
This commit is contained in:
Thomas Haller 2015-01-22 18:47:32 +01:00
parent 95ac7673a8
commit b5433097e2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/devices/nm-device.c
View file

@ -692,6 +692,8 @@ nm_device_get_priority (NMDevice *self)
return 350; return 350;
case NM_DEVICE_TYPE_VLAN: case NM_DEVICE_TYPE_VLAN:
return 400; return 400;
case NM_DEVICE_TYPE_BRIDGE:
return 425;
case NM_DEVICE_TYPE_MODEM: case NM_DEVICE_TYPE_MODEM:
return 450; return 450;
case NM_DEVICE_TYPE_BT: case NM_DEVICE_TYPE_BT:
@ -700,9 +702,16 @@ nm_device_get_priority (NMDevice *self)
return 600; return 600;
case NM_DEVICE_TYPE_OLPC_MESH: case NM_DEVICE_TYPE_OLPC_MESH:
return 650; return 650;
default: case NM_DEVICE_TYPE_GENERIC:
return 950; 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 guint32