| nd6_nbr.c (219562) | nd6_nbr.c (219819) |
|---|---|
| 1/*- 2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/netinet6/nd6_nbr.c 219562 2011-03-12 09:41:25Z bz $"); | 33__FBSDID("$FreeBSD: head/sys/netinet6/nd6_nbr.c 219819 2011-03-21 09:40:01Z jeff $"); |
| 34 35#include "opt_inet.h" 36#include "opt_inet6.h" 37#include "opt_ipsec.h" 38#include "opt_mpath.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 1085 unchanged lines hidden (view full) --- 1127 case IFT_L2VLAN: 1128#endif 1129#ifdef IFT_IEEE80211 1130 case IFT_IEEE80211: 1131#endif 1132#ifdef IFT_CARP 1133 case IFT_CARP: 1134#endif | 34 35#include "opt_inet.h" 36#include "opt_inet6.h" 37#include "opt_ipsec.h" 38#include "opt_mpath.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 1085 unchanged lines hidden (view full) --- 1127 case IFT_L2VLAN: 1128#endif 1129#ifdef IFT_IEEE80211 1130 case IFT_IEEE80211: 1131#endif 1132#ifdef IFT_CARP 1133 case IFT_CARP: 1134#endif |
| 1135 case IFT_INFINIBAND: |
|
| 1135 case IFT_BRIDGE: 1136 case IFT_ISO88025: 1137 return IF_LLADDR(ifp); 1138 default: 1139 return NULL; 1140 } 1141} 1142 --- 301 unchanged lines hidden (view full) --- 1444 switch (ifp->if_type) { 1445 case IFT_ETHER: 1446 case IFT_FDDI: 1447 case IFT_ATM: 1448 case IFT_IEEE1394: 1449#ifdef IFT_IEEE80211 1450 case IFT_IEEE80211: 1451#endif | 1136 case IFT_BRIDGE: 1137 case IFT_ISO88025: 1138 return IF_LLADDR(ifp); 1139 default: 1140 return NULL; 1141 } 1142} 1143 --- 301 unchanged lines hidden (view full) --- 1445 switch (ifp->if_type) { 1446 case IFT_ETHER: 1447 case IFT_FDDI: 1448 case IFT_ATM: 1449 case IFT_IEEE1394: 1450#ifdef IFT_IEEE80211 1451 case IFT_IEEE80211: 1452#endif |
| 1453 case IFT_INFINIBAND: |
|
| 1452 in6 = ia->ia_addr.sin6_addr; 1453 if (in6_get_hw_ifid(ifp, &in6) == 0 && 1454 IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr, &in6)) { 1455 ND_IFINFO(ifp)->flags |= ND6_IFF_IFDISABLED; 1456 log(LOG_ERR, "%s: possible hardware address " 1457 "duplication detected, disable IPv6\n", 1458 if_name(ifp)); 1459 } --- 93 unchanged lines hidden --- | 1454 in6 = ia->ia_addr.sin6_addr; 1455 if (in6_get_hw_ifid(ifp, &in6) == 0 && 1456 IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr, &in6)) { 1457 ND_IFINFO(ifp)->flags |= ND6_IFF_IFDISABLED; 1458 log(LOG_ERR, "%s: possible hardware address " 1459 "duplication detected, disable IPv6\n", 1460 if_name(ifp)); 1461 } --- 93 unchanged lines hidden --- |