diff options
| author | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
| commit | e847e3cc3e4eded45a358bf838e1edcf4c12fcb5 (patch) | |
| tree | 9db16e390931b9b800a174c7117b9297b351283f /src/devices/nm-device-bond.c | |
| parent | 1cd35b49de89f65c386ae2ff98a8e08342c080b0 (diff) | |
| parent | f408e27bccfacf347605a8d98649975a68f38a17 (diff) | |
Merge tag 'upstream/1.0.2'
Upstream version 1.0.2
Diffstat (limited to 'src/devices/nm-device-bond.c')
| -rw-r--r-- | src/devices/nm-device-bond.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index 9d9fe426..0b2c97d1 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -67,7 +67,7 @@ get_generic_capabilities (NMDevice *dev) } static gboolean -is_available (NMDevice *dev) +is_available (NMDevice *dev, NMDeviceCheckDevAvailableFlags flags) { if (NM_DEVICE_GET_CLASS (dev)->is_up) return NM_DEVICE_GET_CLASS (dev)->is_up (dev); @@ -77,6 +77,7 @@ is_available (NMDevice *dev) static gboolean check_connection_available (NMDevice *device, NMConnection *connection, + NMDeviceCheckConAvailableFlags flags, const char *specific_object) { /* Connections are always available because the carrier state is determined |