The #ifdef HAVE_STRUCT_SOCKADDR_DL is true on freebsd but the data structures that are defined by it are never used. This commit removes the dead code.
Signed-off-by: Donald Sharp <sha...@cumulusnetworks.com> --- zebra/interface.h | 10 ---------- zebra/rtadv.c | 3 --- 2 files changed, 13 deletions(-) diff --git a/zebra/interface.h b/zebra/interface.h index dbb33c5..936156e 100644 --- a/zebra/interface.h +++ b/zebra/interface.h @@ -196,16 +196,6 @@ struct zebra_if struct irdp_interface irdp; #endif -#ifdef HAVE_STRUCT_SOCKADDR_DL - union { - /* note that sdl_storage is never accessed, it only exists to make space. - * all actual uses refer to sdl - but use sizeof(sdl_storage)! this fits - * best with C aliasing rules. */ - struct sockaddr_dl sdl; - struct sockaddr_storage sdl_storage; - }; -#endif - #ifdef SUNOS_5 /* the real IFF_UP state of the primary interface. * need this to differentiate between all interfaces being diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 9450f9a..fa62d97 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -132,9 +132,6 @@ rtadv_send_packet (int sock, struct interface *ifp) struct cmsghdr *cmsgptr; struct in6_pktinfo *pkt; struct sockaddr_in6 addr; -#ifdef HAVE_STRUCT_SOCKADDR_DL - struct sockaddr_dl *sdl; -#endif /* HAVE_STRUCT_SOCKADDR_DL */ static void *adata = NULL; unsigned char buf[RTADV_MSG_SIZE]; struct nd_router_advert *rtadv; -- 1.9.1 _______________________________________________ Quagga-dev mailing list Quagga-dev@lists.quagga.net https://lists.quagga.net/mailman/listinfo/quagga-dev