[Midnightbsd-cvs] src [9112] trunk: partially revert toecore changes.

[laffer1 at midnightbsd.org]

Revision: 9112
          http://svnweb.midnightbsd.org/src/?rev=9112
Author:   laffer1
Date:     2016-10-01 20:04:33 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
partially revert toecore changes.

Modified Paths:
--------------
    trunk/sbin/ifconfig/ifconfig.c
    trunk/sys/modules/toecore/Makefile
    trunk/sys/netinet6/nd6.c
    trunk/sys/netinet6/nd6_nbr.c

Modified: trunk/sbin/ifconfig/ifconfig.c
===================================================================
--- trunk/sbin/ifconfig/ifconfig.c	2016-10-01 21:19:18 UTC (rev 9111)
+++ trunk/sbin/ifconfig/ifconfig.c	2016-10-02 00:04:33 UTC (rev 9112)
@@ -910,7 +910,7 @@
 #define	IFCAPBITS \
 "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" \
 "\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" \
-"\17TOE4\20TOE6\21VLAN_HWFILTER\23VLAN_HWTSO\24LINKSTATE\25NETMAP" \
+"\21VLAN_HWFILTER\23VLAN_HWTSO\24LINKSTATE\25NETMAP" \
 "\26RXCSUM_IPV6\27TXCSUM_IPV6"
 
 /*
@@ -1189,8 +1189,6 @@
 	DEF_CMD("-tso4",	-IFCAP_TSO4,	setifcap),
 	DEF_CMD("tso",		IFCAP_TSO,	setifcap),
 	DEF_CMD("-tso",		-IFCAP_TSO,	setifcap),
-	DEF_CMD("toe",		IFCAP_TOE,	setifcap),
-	DEF_CMD("-toe",		-IFCAP_TOE,	setifcap),
 	DEF_CMD("lro",		IFCAP_LRO,	setifcap),
 	DEF_CMD("-lro",		-IFCAP_LRO,	setifcap),
 	DEF_CMD("wol",		IFCAP_WOL,	setifcap),

Modified: trunk/sys/modules/toecore/Makefile
===================================================================
--- trunk/sys/modules/toecore/Makefile	2016-10-01 21:19:18 UTC (rev 9111)
+++ trunk/sys/modules/toecore/Makefile	2016-10-02 00:04:33 UTC (rev 9112)
@@ -1,3 +1,13 @@
+# $MidnightBSD$
+# $FreeBSD: release/9.2.0/sys/modules/toecore/Makefile 237263 2012-06-19 07:34:13Z np $
+
+.PATH: ${.CURDIR}/../../netinet
+
+KMOD=	toecore
+SRCS=	toecore.c
+SRCS+=	opt_ofed.h
+
+.include <bsd.kmod.mk>
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../netinet

Modified: trunk/sys/netinet6/nd6.c
===================================================================
--- trunk/sys/netinet6/nd6.c	2016-10-01 21:19:18 UTC (rev 9111)
+++ trunk/sys/netinet6/nd6.c	2016-10-02 00:04:33 UTC (rev 9112)
@@ -509,7 +509,6 @@
 				ln->la_hold = m0;
 				clear_llinfo_pqueue(ln);
 			}
-			EVENTHANDLER_INVOKE(lle_event, ln, LLENTRY_TIMEDOUT);
 			(void)nd6_free(ln, 0);
 			ln = NULL;
 			if (m != NULL)
@@ -527,7 +526,6 @@
 	case ND6_LLINFO_STALE:
 		/* Garbage Collection(RFC 2461 5.3) */
 		if (!ND6_LLINFO_PERMANENT(ln)) {
-			EVENTHANDLER_INVOKE(lle_event, ln, LLENTRY_EXPIRED);
 			(void)nd6_free(ln, 1);
 			ln = NULL;
 		}
@@ -555,7 +553,6 @@
 			nd6_ns_output(ifp, dst, dst, ln, 0);
 			LLE_WLOCK(ln);
 		} else {
-			EVENTHANDLER_INVOKE(lle_event, ln, LLENTRY_EXPIRED);
 			(void)nd6_free(ln, 0);
 			ln = NULL;
 		}
@@ -1626,7 +1623,6 @@
 		 */
 		bcopy(lladdr, &ln->ll_addr, ifp->if_addrlen);
 		ln->la_flags |= LLE_VALID;
-		EVENTHANDLER_INVOKE(lle_event, ln, LLENTRY_RESOLVED);
 	}
 
 	if (!is_newentry) {
@@ -2195,7 +2191,7 @@
 
 	*lle = NULL;
 	IF_AFDATA_UNLOCK_ASSERT(ifp);
-	if (m != NULL && m->m_flags & M_MCAST) {
+	if (m->m_flags & M_MCAST) {
 		int i;
 
 		switch (ifp->if_type) {

Modified: trunk/sys/netinet6/nd6_nbr.c
===================================================================
--- trunk/sys/netinet6/nd6_nbr.c	2016-10-01 21:19:18 UTC (rev 9111)
+++ trunk/sys/netinet6/nd6_nbr.c	2016-10-02 00:04:33 UTC (rev 9112)
@@ -755,7 +755,6 @@
 		 */
 		bcopy(lladdr, &ln->ll_addr, ifp->if_addrlen);
 		ln->la_flags |= LLE_VALID;
-		EVENTHANDLER_INVOKE(lle_event, ln, LLENTRY_RESOLVED);
 		if (is_solicited) {
 			ln->ln_state = ND6_LLINFO_REACHABLE;
 			ln->ln_byhint = 0;
@@ -831,8 +830,6 @@
 			if (lladdr != NULL) {
 				bcopy(lladdr, &ln->ll_addr, ifp->if_addrlen);
 				ln->la_flags |= LLE_VALID;
-				EVENTHANDLER_INVOKE(lle_event, ln,
-				    LLENTRY_RESOLVED);
 			}
 
 			/*