colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wimax: hw_bring_up is pointless

Browse Source 
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.
This commit is contained in:
Dan Williams
2013-06-13 10:08:52 -05:00
parent 17ce00ff27
commit 4d4a99beaa
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/wimax/nm-device-wimax.c
View File

@@ -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;