Merge tag 'upstream/0.9.7.997' into experimental

Upstream version 0.9.7.997

1 files changed, 3 insertions, 5 deletions

diff --git a/src/nm-device-wired.h b/src/nm-device-wired.h
index 3180ee45..a8084352 100644
--- a/src/nm-device-wired.h
+++ b/src/nm-device-wired.h
@@ -42,15 +42,13 @@ typedef struct {
 typedef struct {
 	NMDeviceClass parent;
 
+	void (*carrier_action) (NMDeviceWired *self,
+	                        NMDeviceState state,
+	                        gboolean carrier);
 } NMDeviceWiredClass;
 
 GType nm_device_wired_get_type (void);
 
-const guint8 *nm_device_wired_get_hwaddr      (NMDeviceWired *dev);
-void          nm_device_wired_set_hwaddr      (NMDeviceWired *dev,
-                                               const guint8 *addr,
-                                               guint addrlen);
-int           nm_device_wired_get_hwaddr_type (NMDeviceWired *dev);
 gboolean      nm_device_wired_get_carrier     (NMDeviceWired *dev);
 guint32       nm_device_wired_get_speed       (NMDeviceWired *dev);