fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: use NMDeviceCapabilities enum for device capabilities

Browse source
This commit is contained in:
Thomas Haller 2015-04-17 15:15:38 +02:00
parent 4bac5afa2b
commit 2117bef864
13 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/adsl/nm-device-adsl.c
View file

@ -73,7 +73,7 @@ typedef struct {
/**************************************************************/ /**************************************************************/
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev) get_generic_capabilities (NMDevice *dev)
{ {
return ( NM_DEVICE_CAP_CARRIER_DETECT return ( NM_DEVICE_CAP_CARRIER_DETECT

2
src/devices/bluetooth/nm-device-bt.c
View file

@ -124,7 +124,7 @@ get_connection_bt_type (NMConnection *connection)
return NM_BT_CAPABILITY_NONE; return NM_BT_CAPABILITY_NONE;
} }
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *device) get_generic_capabilities (NMDevice *device)
{ {
return NM_DEVICE_CAP_IS_NON_KERNEL; return NM_DEVICE_CAP_IS_NON_KERNEL;

2
src/devices/nm-device-bond.c
View file

@ -61,7 +61,7 @@ enum {
/******************************************************************/ /******************************************************************/
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev) get_generic_capabilities (NMDevice *dev)
{ {
return NM_DEVICE_CAP_CARRIER_DETECT; return NM_DEVICE_CAP_CARRIER_DETECT;

2
src/devices/nm-device-bridge.c
View file

@ -59,7 +59,7 @@ enum {
/******************************************************************/ /******************************************************************/
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev) get_generic_capabilities (NMDevice *dev)
{ {
return NM_DEVICE_CAP_CARRIER_DETECT; return NM_DEVICE_CAP_CARRIER_DETECT;

2
src/devices/nm-device-ethernet.c
View file

@ -370,7 +370,7 @@ update_initial_hw_address (NMDevice *dev)
_LOGD (LOGD_DEVICE | LOGD_ETHER, "read initial MAC address %s", priv->initial_hw_addr); _LOGD (LOGD_DEVICE | LOGD_ETHER, "read initial MAC address %s", priv->initial_hw_addr);
} }
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *device) get_generic_capabilities (NMDevice *device)
{ {
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device); NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device);

2
src/devices/nm-device-generic.c
View file

@ -45,7 +45,7 @@ enum {
LAST_PROP LAST_PROP
}; };
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev) get_generic_capabilities (NMDevice *dev)
{ {
if (nm_platform_link_supports_carrier_detect (nm_device_get_ifindex (dev))) if (nm_platform_link_supports_carrier_detect (nm_device_get_ifindex (dev)))

2
src/devices/nm-device-infiniband.c
View file

@ -59,7 +59,7 @@ nm_device_infiniband_init (NMDeviceInfiniband * self)
{ {
} }
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev) get_generic_capabilities (NMDevice *dev)
{ {
return NM_DEVICE_CAP_CARRIER_DETECT; return NM_DEVICE_CAP_CARRIER_DETECT;

2
src/devices/nm-device-vlan.c
View file

@ -84,7 +84,7 @@ update_initial_hw_address (NMDevice *dev)
_LOGD (LOGD_DEVICE | LOGD_VLAN, "read initial MAC address %s", priv->initial_hw_addr); _LOGD (LOGD_DEVICE | LOGD_VLAN, "read initial MAC address %s", priv->initial_hw_addr);
} }
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev) get_generic_capabilities (NMDevice *dev)
{ {
/* We assume VLAN interfaces always support carrier detect */ /* We assume VLAN interfaces always support carrier detect */

4
src/devices/nm-device.c
View file

@ -191,7 +191,7 @@ typedef struct {
int ip_ifindex; int ip_ifindex;
NMDeviceType type; NMDeviceType type;
char * type_desc; char * type_desc;
guint32 capabilities; NMDeviceCapabilities capabilities;
char * driver; char * driver;
char * driver_version; char * driver_version;
char * firmware_version; char * firmware_version;
@ -476,7 +476,7 @@ nm_device_ipv6_sysctl_get_int32 (NMDevice *self, const char *property, gint32 fa
static gboolean static gboolean
device_has_capability (NMDevice *self, NMDeviceCapabilities caps) device_has_capability (NMDevice *self, NMDeviceCapabilities caps)
{ {
return !!(NM_DEVICE_GET_PRIVATE (self)->capabilities & caps); return NM_FLAGS_ANY (NM_DEVICE_GET_PRIVATE (self)->capabilities, caps);
} }
/***********************************************************/ /***********************************************************/

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

@ -143,7 +143,7 @@ typedef struct {
gboolean (* get_ip_iface_identifier) (NMDevice *self, NMUtilsIPv6IfaceId *out_iid); gboolean (* get_ip_iface_identifier) (NMDevice *self, NMUtilsIPv6IfaceId *out_iid);
guint32 (* get_generic_capabilities) (NMDevice *self); NMDeviceCapabilities (* get_generic_capabilities) (NMDevice *self);
gboolean (* is_available) (NMDevice *self, NMDeviceCheckDevAvailableFlags flags); gboolean (* is_available) (NMDevice *self, NMDeviceCheckDevAvailableFlags flags);

2
src/devices/team/nm-device-team.c
View file

@ -70,7 +70,7 @@ static gboolean teamd_start (NMDevice *device, NMSettingTeam *s_team);
/******************************************************************/ /******************************************************************/
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *device) get_generic_capabilities (NMDevice *device)
{ {
return NM_DEVICE_CAP_CARRIER_DETECT; return NM_DEVICE_CAP_CARRIER_DETECT;

2
src/devices/wwan/nm-device-modem.c
View file

@ -376,7 +376,7 @@ device_state_changed (NMDevice *device,
} }
} }
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *device) get_generic_capabilities (NMDevice *device)
{ {
return NM_DEVICE_CAP_IS_NON_KERNEL; return NM_DEVICE_CAP_IS_NON_KERNEL;

2
src/tests/config/nm-test-device.c
View file

@ -61,7 +61,7 @@ dispose (GObject *object)
g_object_class->dispose (object); g_object_class->dispose (object);
} }
static guint32 static NMDeviceCapabilities
get_generic_capabilities (NMDevice *device) get_generic_capabilities (NMDevice *device)
{ {
return NM_DEVICE_CAP_IS_NON_KERNEL; return NM_DEVICE_CAP_IS_NON_KERNEL;