From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 12 Apr 2015 18:15:08 +0000 (+0200)
Subject: dhcp: yes, infiniband has the larger MAC address length, but let the compuler figure... 
X-Git-Tag: v220~445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd168445f851adc196125b98d59961b2085ff763;p=thirdparty%2Fsystemd.git

dhcp: yes, infiniband has the larger MAC address length, but let the compuler figure that out...
---

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index c44392eb81d..0193e42d651 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -38,7 +38,7 @@
 #include "sd-dhcp-client.h"
 
 #define MAX_CLIENT_ID_LEN (sizeof(uint32_t) + MAX_DUID_LEN)  /* Arbitrary limit */
-#define MAX_MAC_ADDR_LEN INFINIBAND_ALEN
+#define MAX_MAC_ADDR_LEN CONST_MAX(INFINIBAND_ALEN, ETH_ALEN)
 
 struct sd_dhcp_client {
         RefCount n_ref;