From: David Lamparter <equinox@diac24.net>
Date: Sat, 5 Aug 2017 03:19:01 +0000 (+0200)
Subject: Merge pull request #899 from donaldsharp/ETH_ALEN
X-Git-Tag: frr-4.0-dev~452
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c053ff8bff5adba000097ae81c17a0e1cb6c7a43;p=mirror%2Ffrr.git

Merge pull request #899 from donaldsharp/ETH_ALEN

Fix Crash and Convert to ETH_ALEN
---

c053ff8bff5adba000097ae81c17a0e1cb6c7a43
diff --cc zebra/rt_netlink.c
index 887ea4794d,cf78a197ce..192fffd29c
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@@ -1704,9 -1704,9 +1704,9 @@@ static int netlink_macfdb_change(struc
  		return 0;
  	}
  
- 	if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETHER_ADDR_LEN) {
+ 	if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETH_ALEN) {
  		zlog_warn(
 -			"%s family %s IF %s(%u) brIF %u - LLADDR is not MAC, len %ld",
 +			"%s family %s IF %s(%u) brIF %u - LLADDR is not MAC, len %lu",
  			nl_msg_type_to_str(h->nlmsg_type),
  			nl_family_to_str(ndm->ndm_family), ifp->name,
  			ndm->ndm_ifindex, zif->brslave_info.bridge_ifindex,
@@@ -2033,9 -2033,9 +2033,9 @@@ static int netlink_ipneigh_change(struc
  
  	if (h->nlmsg_type == RTM_NEWNEIGH) {
  		if (tb[NDA_LLADDR]) {
- 			if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETHER_ADDR_LEN) {
+ 			if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETH_ALEN) {
  				zlog_warn(
 -					"%s family %s IF %s(%u) - LLADDR is not MAC, len %ld",
 +					"%s family %s IF %s(%u) - LLADDR is not MAC, len %lu",
  					nl_msg_type_to_str(h->nlmsg_type),
  					nl_family_to_str(ndm->ndm_family),
  					ifp->name, ndm->ndm_ifindex,