fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 23:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wired: get rid of nm_device_ethernet_get_carrier

Browse source 
Only used internally; just use priv->carrier instead
This commit is contained in:
Dan Williams 2009-09-14 12:54:09 -07:00
parent ab167b1994
commit 0be66daa9a
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/nm-device-ethernet.c
View file

@ -413,17 +413,6 @@ nm_device_ethernet_get_address (NMDeviceEthernet *self, struct ether_addr *addr)
memcpy (addr, &(NM_DEVICE_ETHERNET_GET_PRIVATE (self)->hw_addr), sizeof (struct ether_addr));
}
/*
* Get/set functions for carrier
*/
gboolean
nm_device_ethernet_get_carrier (NMDeviceEthernet *self)
{
g_return_val_if_fail (self != NULL, FALSE);
return NM_DEVICE_ETHERNET_GET_PRIVATE (self)->carrier;
}
guint32
nm_device_ethernet_get_ifindex (NMDeviceEthernet *self)
{
@ -531,7 +520,7 @@ real_can_interrupt_activation (NMDevice *dev)
* if the link becomes inactive.
*/
if (nm_device_get_capabilities (dev) & NM_DEVICE_CAP_CARRIER_DETECT) {
if (nm_device_ethernet_get_carrier (self) == FALSE)
if (NM_DEVICE_ETHERNET_GET_PRIVATE (self)->carrier == FALSE)
interrupt = TRUE;
}
return interrupt;
@ -543,7 +532,7 @@ real_can_activate (NMDevice *dev)
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
/* Can't do anything if there isn't a carrier */
if (!nm_device_ethernet_get_carrier (self))
if (!NM_DEVICE_ETHERNET_GET_PRIVATE (self)->carrier)
return FALSE;
return TRUE;
@ -1719,24 +1708,25 @@ dispose (GObject *object)
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
GValue *value, GParamSpec *pspec)
{
NMDeviceEthernet *device = NM_DEVICE_ETHERNET (object);
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (object);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
struct ether_addr hw_addr;
switch (prop_id) {
case PROP_HW_ADDRESS:
nm_device_ethernet_get_address (device, &hw_addr);
nm_device_ethernet_get_address (self, &hw_addr);
g_value_take_string (value, nm_ether_ntop (&hw_addr));
break;
case PROP_SPEED:
g_value_set_uint (value, nm_device_ethernet_get_speed (device));
g_value_set_uint (value, nm_device_ethernet_get_speed (self));
break;
case PROP_CARRIER:
g_value_set_boolean (value, nm_device_ethernet_get_carrier (device));
g_value_set_boolean (value, priv->carrier);
break;
case PROP_IFINDEX:
g_value_set_uint (value, nm_device_ethernet_get_ifindex (device));
g_value_set_uint (value, priv->ifindex);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

2
src/nm-device-ethernet.h
View file

@ -64,8 +64,6 @@ NMDevice *nm_device_ethernet_new (const char *udi,
void nm_device_ethernet_get_address (NMDeviceEthernet *dev,
struct ether_addr *addr);
gboolean nm_device_ethernet_get_carrier (NMDeviceEthernet *dev);
guint32 nm_device_ethernet_get_ifindex (NMDeviceEthernet *dev);
G_END_DECLS