]> git.puffer.fish Git - matthieu/frr.git/commitdiff
babeld: The sockaddr code is not passed through anymore
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 26 May 2017 18:56:19 +0000 (14:56 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 26 May 2017 18:56:19 +0000 (14:56 -0400)
The hw_addr_len and hw_addr are properly setup on all
the different systems.  We no longer need to have
individual daemons know anything about this underlying
mechanism to get the data from the kernel.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
babeld/kernel.c

index da8fadac7cc2acc606153925ec1248119d01f453..9aaa892b448352f12b284e1d3ce442ba96cebca8 100644 (file)
@@ -250,13 +250,10 @@ if_eui64(char *ifname, int ifindex, unsigned char *eui)
     if (ifp == NULL) {
         return -1;
     }
-#ifdef HAVE_STRUCT_SOCKADDR_DL
-    u_char len = ifp->sdl.sdl_alen;
-    char *tmp = ifp->sdl.sdl_data + ifp->sdl.sdl_nlen;
-#else
+
     u_char len = (u_char) ifp->hw_addr_len;
     char *tmp = (void*) ifp->hw_addr;
-#endif
+
     if (len == 8) {
         memcpy(eui, tmp, 8);
         eui[0] ^= 2;