colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: add addr parameter to NMPlatformLink

Browse Source
This commit is contained in:
Thomas Haller
2015-04-27 18:06:59 +02:00
parent 3cdde18f52
commit 36e77218a0
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/nm-linux-platform.c
View File

@@ -928,6 +928,7 @@ init_link (NMPlatform *platform, NMPlatformLink *info, struct rtnl_link *rtnllin
GUdevDevice *udev_device;
const char *name;
char *tmp;
struct nl_addr *nladdr;
g_return_val_if_fail (rtnllink, FALSE);
@@ -952,6 +953,17 @@ init_link (NMPlatform *platform, NMPlatformLink *info, struct rtnl_link *rtnllin
if (info->type == NM_LINK_TYPE_VLAN)
info->vlan_id = rtnl_link_vlan_get_id (rtnllink);
if ((nladdr = rtnl_link_get_addr (rtnllink))) {
unsigned int l = 0;
l = nl_addr_get_len (nladdr);
if (l > 0 && l <= NM_UTILS_HWADDR_LEN_MAX) {
G_STATIC_ASSERT (NM_UTILS_HWADDR_LEN_MAX == sizeof (info->addr.data));
memcpy (info->addr.data, nl_addr_get_binary_addr (nladdr), l);
info->addr.len = l;
}
}
udev_device = g_hash_table_lookup (priv->udev_devices, GINT_TO_POINTER (info->ifindex));
if (udev_device) {
info->driver = nmp_utils_udev_get_driver (udev_device);