svn commit: r281868 - stable/10/sys/netinet6

[Andrey V. Elsukov]

Author: ae
Date: Wed Apr 22 20:42:17 2015
New Revision: 281868
URL: https://svnweb.freebsd.org/changeset/base/281868

Log:
  MFC r274988 (with modification):
    Skip L2 addresses lookups for tunneling interfaces.
  
  PR:		197286

Modified:
  stable/10/sys/netinet6/in6.c
  stable/10/sys/netinet6/nd6.c
Directory Properties:
  stable/10/   (props changed)
  stable/10/sys/gnu/dts/   (props changed)

Modified: stable/10/sys/netinet6/in6.c
==============================================================================
--- stable/10/sys/netinet6/in6.c	Wed Apr 22 19:59:08 2015	(r281867)
+++ stable/10/sys/netinet6/in6.c	Wed Apr 22 20:42:17 2015	(r281868)
@@ -155,6 +155,8 @@ in6_ifaddloop(struct ifaddr *ifa)
 
 	ia = ifa2ia6(ifa);
 	ifp = ifa->ifa_ifp;
+	if (nd6_need_cache(ifp) == 0)
+		return;
 	IF_AFDATA_LOCK(ifp);
 	ifa->ifa_rtrequest = nd6_rtrequest;
 	ln = lla_lookup(LLTABLE6(ifp), (LLE_CREATE | LLE_IFADDR |

Modified: stable/10/sys/netinet6/nd6.c
==============================================================================
--- stable/10/sys/netinet6/nd6.c	Wed Apr 22 19:59:08 2015	(r281867)
+++ stable/10/sys/netinet6/nd6.c	Wed Apr 22 20:42:17 2015	(r281868)
@@ -2185,9 +2185,6 @@ nd6_need_cache(struct ifnet *ifp)
 	case IFT_IEEE80211:
 #endif
 	case IFT_INFINIBAND:
-	case IFT_GIF:		/* XXX need more cases? */
-	case IFT_PPP:
-	case IFT_TUNNEL:
 	case IFT_BRIDGE:
 	case IFT_PROPVIRTUAL:
 		return (1);