diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-04-27 12:35:21 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-04-27 17:21:33 +0200 |
| commit | 8ac1bf76bd1f6c7df9503576ea5a01ef17960769 (patch) | |
| tree | 59dbbebfddb69d572d232791cc51d5567d8e3a28 /src/platform | |
| parent | 9c37b4ae21b52dcefcdf254c93a107e94db0db10 (diff) | |
| download | NetworkManager-8ac1bf76bd1f6c7df9503576ea5a01ef17960769.tar.gz | |
core: move NMIPAddr to nm-core-utils.h
(cherry picked from commit 67da0a28db834192d207fb315a3ba1983fe4a79e)
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/nm-platform.c | 4 | ||||
| -rw-r--r-- | src/platform/nm-platform.h | 18 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 7ef22ad5ab..767187d96b 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -43,10 +43,6 @@ /*****************************************************************************/ -const NMIPAddr nm_ip_addr_zero = NMIPAddrInit; - -/*****************************************************************************/ - G_STATIC_ASSERT (sizeof ( ((NMPlatformLink *) NULL)->addr.data ) == NM_UTILS_HWADDR_LEN_MAX); G_STATIC_ASSERT (G_STRUCT_OFFSET (NMPlatformIPAddress, address_ptr) == G_STRUCT_OFFSET (NMPlatformIP4Address, address)); G_STATIC_ASSERT (G_STRUCT_OFFSET (NMPlatformIPAddress, address_ptr) == G_STRUCT_OFFSET (NMPlatformIP6Address, address)); diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index f1679fd113..43be17fa0c 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -93,24 +93,6 @@ typedef enum { /*< skip >*/ NM_PLATFORM_ERROR_OPNOTSUPP, } NMPlatformError; - -typedef struct { - union { - guint8 addr_ptr[1]; - in_addr_t addr4; - struct in6_addr addr6; - - /* NMIPAddr is really a union for IP addresses. - * However, as ethernet addresses fit in here nicely, use - * it also for an ethernet MAC address. */ - guint8 addr_eth[6 /*ETH_ALEN*/]; - }; -} NMIPAddr; - -extern const NMIPAddr nm_ip_addr_zero; - -#define NMIPAddrInit { .addr6 = IN6ADDR_ANY_INIT } - #define NM_PLATFORM_LINK_OTHER_NETNS (-1) #define __NMPlatformObject_COMMON \ |