diff options
author | Dan Winship <danw@gnome.org> | 2013-03-19 09:17:41 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2013-04-03 10:23:49 -0400 |
commit | 5fec30d98e6cadb3d02cf4537a0bac8f66dba1c5 (patch) | |
tree | 57cb57900b6a30d7cb8f56e219978a69a9a57bed /src/nm-device.h | |
parent | 1ca4745394f9b3c6d15ae885c069bda949241505 (diff) | |
download | NetworkManager-5fec30d98e6cadb3d02cf4537a0bac8f66dba1c5.tar.gz |
Revert :carrier-detect properties and associated code
Ignoring carrier is generally something you want at the machine level
(eg, for a server), not at the connection level.
Diffstat (limited to 'src/nm-device.h')
-rw-r--r-- | src/nm-device.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nm-device.h b/src/nm-device.h index f1b92c8488..23da79c2e3 100644 --- a/src/nm-device.h +++ b/src/nm-device.h @@ -118,8 +118,7 @@ typedef struct { guint32 (* get_type_capabilities) (NMDevice *self); guint32 (* get_generic_capabilities) (NMDevice *self); - gboolean (* is_available) (NMDevice *self, - gboolean need_carrier); + gboolean (* is_available) (NMDevice *self); gboolean (* get_enabled) (NMDevice *self); @@ -239,8 +238,7 @@ void nm_device_slave_notify_enslaved (NMDevice *dev, NMActRequest * nm_device_get_act_request (NMDevice *dev); NMConnection * nm_device_get_connection (NMDevice *dev); -gboolean nm_device_is_available (NMDevice *dev, - gboolean need_carrier); +gboolean nm_device_is_available (NMDevice *dev); NMConnection * nm_device_get_best_auto_connection (NMDevice *dev, GSList *connections, |