Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 4 Sep 2015 15:49:52 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r287464 - in projects/ifnet/sys: netinet netinet6
Message-ID:  <201509041549.t84Fnq40020304@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Fri Sep  4 15:49:51 2015
New Revision: 287464
URL: https://svnweb.freebsd.org/changeset/base/287464

Log:
  Fix compilation failures after head/ merge.

Modified:
  projects/ifnet/sys/netinet/if_ether.c
  projects/ifnet/sys/netinet/in.c
  projects/ifnet/sys/netinet6/in6.c
  projects/ifnet/sys/netinet6/nd6.c
  projects/ifnet/sys/netinet6/nd6_nbr.c

Modified: projects/ifnet/sys/netinet/if_ether.c
==============================================================================
--- projects/ifnet/sys/netinet/if_ether.c	Fri Sep  4 15:45:42 2015	(r287463)
+++ projects/ifnet/sys/netinet/if_ether.c	Fri Sep  4 15:49:51 2015	(r287464)
@@ -474,7 +474,7 @@ arpresolve(struct ifnet *ifp, int is_gw,
 		if (m->m_flags & M_BCAST) {
 			/* broadcast */
 			(void)memcpy(desten,
-			    ifp->if_broadcastaddr, ifp->if_addrlen);
+			    ifp->if_broadcastaddr, if_addrlen(ifp));
 			return (0);
 		}
 		if (m->m_flags & M_MCAST) {
@@ -493,7 +493,7 @@ arpresolve(struct ifnet *ifp, int is_gw,
 
 	if ((la->la_flags & LLE_VALID) &&
 	    ((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime)) {
-		bcopy(&la->ll_addr, desten, ifp->if_addrlen);
+		bcopy(&la->ll_addr, desten, if_addrlen(ifp));
 		renew = 0;
 		/*
 		 * If entry has an expiry time and it is approaching,
@@ -761,11 +761,11 @@ match:
 		goto drop;
 	}
 
-	if (ifp->if_addrlen != ah->ar_hln) {
+	if (if_addrlen(ifp) != ah->ar_hln) {
 		ARP_LOG(LOG_WARNING, "from %*D: addr len: new %d, "
-		    "i/f %d (ignored)\n", ifp->if_addrlen,
+		    "i/f %d (ignored)\n", if_addrlen(ifp),
 		    (u_char *) ar_sha(ah), ":", ah->ar_hln,
-		    ifp->if_addrlen);
+		    if_addrlen(ifp));
 		goto drop;
 	}
 
@@ -973,20 +973,20 @@ arp_check_update_lle(struct arphdr *ah, 
 			    "but got reply from %*D on %s\n",
 			    inet_ntoa(isaddr),
 			    la->lle_tbl->llt_ifp->if_xname,
-			    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+			    if_addrlen(ifp), (u_char *)ar_sha(ah), ":",
 			    ifp->if_xname);
 		LLE_WUNLOCK(la);
 		return;
 	}
 	if ((la->la_flags & LLE_VALID) &&
-	    bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) {
+	    bcmp(ar_sha(ah), &la->ll_addr, if_addrlen(ifp))) {
 		if (la->la_flags & LLE_STATIC) {
 			LLE_WUNLOCK(la);
 			if (log_arp_permanent_modify)
 				ARP_LOG(LOG_ERR,
 				    "%*D attempts to modify "
 				    "permanent entry for %s on %s\n",
-				    ifp->if_addrlen,
+				    if_addrlen(ifp),
 				    (u_char *)ar_sha(ah), ":",
 				    inet_ntoa(isaddr), ifp->if_xname);
 			return;
@@ -995,15 +995,15 @@ arp_check_update_lle(struct arphdr *ah, 
 			ARP_LOG(LOG_INFO, "%s moved from %*D "
 			    "to %*D on %s\n",
 			    inet_ntoa(isaddr),
-			    ifp->if_addrlen,
+			    if_addrlen(ifp),
 			    (u_char *)&la->ll_addr, ":",
-			    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+			    if_addrlen(ifp), (u_char *)ar_sha(ah), ":",
 			    ifp->if_xname);
 		}
 	}
 
 	/* Check if something has changed */
-	if (memcmp(&la->ll_addr, ar_sha(ah), ifp->if_addrlen) != 0 ||
+	if (memcmp(&la->ll_addr, ar_sha(ah), if_addrlen(ifp)) != 0 ||
 	    (la->la_flags & LLE_VALID) == 0) {
 		/* Perform real LLE update */
 		/* use afdata WLOCK to update fields */
@@ -1049,7 +1049,7 @@ arp_check_update_lle(struct arphdr *ah, 
 			m_hold->m_nextpkt = NULL;
 			/* Avoid confusing lower layers. */
 			m_clrprotoflags(m_hold);
-			(*ifp->if_output)(ifp, m_hold, &sa, NULL);
+			if_output(ifp, m_hold, &sa, NULL);
 		}
 	} else
 		LLE_WUNLOCK(la);
@@ -1062,7 +1062,7 @@ static void
 arp_update_lle(struct arphdr *ah, struct ifnet *ifp, struct llentry *la)
 {
 
-	memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen);
+	memcpy(&la->ll_addr, ar_sha(ah), if_addrlen(ifp));
 	la->la_flags |= LLE_VALID;
 }
 
@@ -1105,8 +1105,8 @@ arp_ifinit(struct ifnet *ifp, struct ifa
 	if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) == INADDR_ANY)
 		return;
 
-	arprequest(ifp, &IA_SIN(ifa)->sin_addr,
-			&IA_SIN(ifa)->sin_addr, IF_LLADDR(ifp));
+	arprequest(ifp, &IA_SIN(ifa)->sin_addr, &IA_SIN(ifa)->sin_addr,
+	    if_lladdr(ifp));
 
 	/*
 	 * Interface address LLE record is considered static

Modified: projects/ifnet/sys/netinet/in.c
==============================================================================
--- projects/ifnet/sys/netinet/in.c	Fri Sep  4 15:45:42 2015	(r287463)
+++ projects/ifnet/sys/netinet/in.c	Fri Sep  4 15:49:51 2015	(r287464)
@@ -1233,7 +1233,7 @@ in_lltable_alloc(struct lltable *llt, u_
 	}
 	lle->la_flags = flags;
 	if ((flags & LLE_IFADDR) == LLE_IFADDR) {
-		bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen);
+		bcopy(if_lladdr(ifp), &lle->ll_addr, if_addrlen(ifp));
 		lle->la_flags |= (LLE_VALID | LLE_STATIC);
 	}
 

Modified: projects/ifnet/sys/netinet6/in6.c
==============================================================================
--- projects/ifnet/sys/netinet6/in6.c	Fri Sep  4 15:45:42 2015	(r287463)
+++ projects/ifnet/sys/netinet6/in6.c	Fri Sep  4 15:49:51 2015	(r287464)
@@ -2255,7 +2255,7 @@ in6_lltable_alloc(struct lltable *llt, u
 	}
 	lle->la_flags = flags;
 	if ((flags & LLE_IFADDR) == LLE_IFADDR) {
-		bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen);
+		bcopy(if_lladdr(ifp), &lle->ll_addr, if_addrlen(ifp));
 		lle->la_flags |= (LLE_VALID | LLE_STATIC);
 	}
 

Modified: projects/ifnet/sys/netinet6/nd6.c
==============================================================================
--- projects/ifnet/sys/netinet6/nd6.c	Fri Sep  4 15:45:42 2015	(r287463)
+++ projects/ifnet/sys/netinet6/nd6.c	Fri Sep  4 15:49:51 2015	(r287464)
@@ -182,11 +182,11 @@ nd6_lle_event(void *arg __unused, struct
 	    in6_addrscope(&dst.sin6_addr));
 	gw.sdl_len = sizeof(struct sockaddr_dl);
 	gw.sdl_family = AF_LINK;
-	gw.sdl_alen = ifp->if_addrlen;
+	gw.sdl_alen = if_addrlen(ifp);
 	gw.sdl_index = ifp->if_index;
-	gw.sdl_type = ifp->if_type;
+	gw.sdl_type = if_type(ifp);
 	if (evt == LLENTRY_RESOLVED)
-		bcopy(&lle->ll_addr, gw.sdl_data, ifp->if_addrlen);
+		bcopy(&lle->ll_addr, gw.sdl_data, if_addrlen(ifp));
 	rtinfo.rti_info[RTAX_DST] = (struct sockaddr *)&dst;
 	rtinfo.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&gw;
 	rtinfo.rti_addrs = RTA_DST | RTA_GATEWAY;

Modified: projects/ifnet/sys/netinet6/nd6_nbr.c
==============================================================================
--- projects/ifnet/sys/netinet6/nd6_nbr.c	Fri Sep  4 15:45:42 2015	(r287463)
+++ projects/ifnet/sys/netinet6/nd6_nbr.c	Fri Sep  4 15:49:51 2015	(r287464)
@@ -1308,7 +1308,6 @@ nd6_dad_start(struct ifaddr *ifa, int de
 		return;
 	}
 	if (!(ifa->ifa_ifp->if_flags & IFF_UP) ||
-	    !(ifa->ifa_ifp->if_drv_flags & IFF_DRV_RUNNING) ||
 	    (ND_IFINFO(ifa->ifa_ifp)->flags & ND6_IFF_IFDISABLED)) {
 		ia->ia6_flags |= IN6_IFF_TENTATIVE;
 		return;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509041549.t84Fnq40020304>