diff options
| author | Dan Winship <danw@gnome.org> | 2014-07-04 15:59:19 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-07 12:08:16 -0400 |
| commit | 35f36ba4c368938b33e06519f767e726dfaebaea (patch) | |
| tree | 0235505fa1087f762d3008e3a9c2fd43f03a5c58 /libnm/nm-device-infiniband.c | |
| parent | 86ab915f6af452a38b7d112d63c4989f052024c2 (diff) | |
| download | NetworkManager-35f36ba4c368938b33e06519f767e726dfaebaea.tar.gz | |
libnm-core, etc: drop type-based hwaddr funcs, port to length-based ones
Drop the arptype-based nm_utils_hwaddr funcs, and rename the
length-based ones to no longer have _len in their names. This also
switches nm_utils_hwaddr_atoba() to using a length rather than an
arptype, and adds a length argument to nm_utils_hwaddr_valid() (making
nm_utils_hwaddr_valid() now a replacement for nm_utils_hwaddr_aton()
in some places, where we were only using aton() to do validity
checking).
Diffstat (limited to 'libnm/nm-device-infiniband.c')
| -rw-r--r-- | libnm/nm-device-infiniband.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index b3f7270b17..93b3298eb4 100644 --- a/libnm/nm-device-infiniband.c +++ b/libnm/nm-device-infiniband.c @@ -130,7 +130,7 @@ connection_compatible (NMDevice *device, NMConnection *connection, GError **erro hwaddr_str = nm_device_infiniband_get_hw_address (NM_DEVICE_INFINIBAND (device)); if (hwaddr_str) { - hwaddr = nm_utils_hwaddr_aton (hwaddr_str, ARPHRD_INFINIBAND, hwaddr_buf); + hwaddr = nm_utils_hwaddr_aton (hwaddr_str, hwaddr_buf, INFINIBAND_ALEN); if (!hwaddr) { g_set_error (error, NM_DEVICE_INFINIBAND_ERROR, NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC, "Invalid device MAC address."); |