system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-05-29 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-device-private.h
		- Remove unused prototypes and clean up

	* src/nm-device.c
		- Remove anything related to system_config_data, which is no longer used
		- (nm_device_new_ip4_autoip_config): make static



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3707 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-05-29 20:35:34 +00:00
parent d92960e47f
commit 3318502fb8
3 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-05-29 Dan Williams <dcbw@redhat.com>
* src/nm-device-private.h
- Remove unused prototypes and clean up
* src/nm-device.c
- Remove anything related to system_config_data, which is no longer used
- (nm_device_new_ip4_autoip_config): make static
2008-05-29 Tambet Ingo <tambet@gmail.com>
* system-settings/plugins/ifcfg-suse/nm-suse-connection.c

11
src/nm-device-private.h
View file

@ -24,14 +24,13 @@
#include "nm-device.h"
void nm_device_set_ip_iface (NMDevice *self, const char *iface);
void nm_device_set_device_type (NMDevice *dev, NMDeviceType type);
void nm_device_set_active_link (NMDevice *dev, const gboolean active);
NMIP4Config * nm_device_new_ip4_autoip_config (NMDevice *self);
void nm_device_set_ip_iface (NMDevice *self, const char *iface);
void nm_device_activate_schedule_stage3_ip_config_start (NMDevice *device);
void nm_device_set_device_type (NMDevice *dev, NMDeviceType type);
void nm_device_state_changed (NMDevice *device, NMDeviceState state);
void nm_device_activate_schedule_stage3_ip_config_start (NMDevice *device);
void nm_device_state_changed (NMDevice *device, NMDeviceState state);
gboolean nm_device_hw_bring_up (NMDevice *self, gboolean wait);

19
src/nm-device.c
View file

@ -82,7 +82,6 @@ struct _NMDevicePrivate
gulong secrets_failed_id;
/* IP configuration info */
void * system_config_data; /* Distro-specific config data (parsed config file, etc) */
NMIP4Config * ip4_config; /* Config from DHCP, PPP, or system config files */
NMDHCPManager * dhcp_manager;
gulong dhcp_state_sigid;
@ -130,7 +129,6 @@ nm_device_init (NMDevice * self)
self->priv->act_source_id = 0;
self->priv->system_config_data = NULL;
self->priv->ip4_config = NULL;
self->priv->state = NM_DEVICE_STATE_UNMANAGED;
@ -615,7 +613,7 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self)
* Build up an IP config with a Link Local address
*
*/
NMIP4Config *
static NMIP4Config *
nm_device_new_ip4_autoip_config (NMDevice *self)
{
struct in_addr ip;
@ -1485,21 +1483,6 @@ nm_device_take_down (NMDevice *self, gboolean wait)
nm_device_hw_take_down (self, wait);
}
/*
* nm_device_get_system_config_data
*
* Return distro-specific system configuration data for this device.
*
*/
void *
nm_device_get_system_config_data (NMDevice *self)
{
g_return_val_if_fail (self != NULL, NULL);
return self->priv->system_config_data;
}
static void
nm_device_dispose (GObject *object)
{