diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-06-13 10:08:52 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-06-14 13:45:39 -0500 |
| commit | 4d4a99beaa49b8d9c374f09aee2631e72402c503 (patch) | |
| tree | 5734ff35506f0951577400bdae7fe5c98c0f1958 | |
| parent | 17ce00ff273c6db08fffa8e8381bf16844472524 (diff) | |
wimax: hw_bring_up is pointless
The function only checked whether wimax was enabled (rfkill/user pref)
and whether wimaxd was running. Only nm-device.c calls this function
for WiMAX devices, and the only two uses of it were during activation
(which is already covered by nm-device-wimax.c's is_available() function)
and when the device enters the UNAVAILABLE state, where it is used
to check for missing firmware, which is implemented by the parent
class, not WiMAX.
| -rw-r--r-- | src/devices/wimax/nm-device-wimax.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/devices/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c index 8c0a8b13..9e9fae2c 100644 --- a/src/devices/wimax/nm-device-wimax.c +++ b/src/devices/wimax/nm-device-wimax.c @@ -332,17 +332,6 @@ set_enabled (NMDevice *device, gboolean enabled) /* NMDevice methods */ -static gboolean -hw_bring_up (NMDevice *dev, gboolean *no_firmware) -{ - NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (dev); - - if (!priv->enabled || !priv->wimaxd_enabled) - return FALSE; - - return NM_DEVICE_GET_CLASS (dev)->hw_bring_up (dev, no_firmware); -} - static const GByteArray * get_connection_hw_address (NMDevice *device, NMConnection *connection) @@ -1394,7 +1383,6 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *klass) object_class->get_property = get_property; object_class->dispose = dispose; - device_class->hw_bring_up = hw_bring_up; device_class->check_connection_compatible = check_connection_compatible; device_class->check_connection_available = check_connection_available; device_class->complete_connection = complete_connection; |