From owner-p4-projects@FreeBSD.ORG Thu Sep 3 11:22:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35D1D1065676; Thu, 3 Sep 2009 11:22:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D671F1065670 for ; Thu, 3 Sep 2009 11:22:49 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C50918FC14 for ; Thu, 3 Sep 2009 11:22:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83BMnCx052458 for ; Thu, 3 Sep 2009 11:22:49 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83BMnP5052456 for perforce@freebsd.org; Thu, 3 Sep 2009 11:22:49 GMT (envelope-from anchie@FreeBSD.org) Date: Thu, 3 Sep 2009 11:22:49 GMT Message-Id: <200909031122.n83BMnP5052456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2009 11:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=168098 Change 168098 by anchie@anchie_malimis on 2009/09/03 11:21:58 Deleting unrelated noise. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#20 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#11 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#19 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#11 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1988, 1991, 1993 * The Regents of the University of California. All rights reserved. * ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#11 (text+ko) ==== @@ -127,9 +127,6 @@ #define ICMP6_NI_REPLY 140 /* node information reply */ #define MLDV2_LISTENER_REPORT 143 /* RFC3810 listener report */ -#define SEND_CERT_PATH_SOLICIT 148 /* cert path solicitation */ -#define SEND_CERT_PATH_ADVERT 149 /* cert path advertisement */ - /* The definitions below are experimental. TBA */ #define MLD_MTRACE_RESP 200 /* mtrace resp (to sender) */ #define MLD_MTRACE 201 /* mtrace messages */ @@ -618,7 +615,6 @@ kmod_icmp6stat_inc(offsetof(struct icmp6stat, name) / sizeof(u_quad_t)) #endif - /* * Names for ICMP sysctl objects */ ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. * @@ -1871,7 +1871,6 @@ nd6_llinfo_settimer(ln, (long)ND_IFINFO(ifp)->retrans * hz / 1000); - nd6_ns_output(ifp, NULL, &dst->sin6_addr, ln, 0); } return (0); @@ -1918,7 +1917,9 @@ * after the lock is dropped */ - /* This will be done in the input hook. */ + /* XXX-AK: In case of SeND loaded, this should be added to + * the input hook. + */ if (lle != NULL) { if (*chain == NULL) *chain = m; @@ -1936,8 +1937,9 @@ } /* - * In case of NS and NA, we end-up here after calling nd6_ns_output() - * or nd6_na_output(). RS, RA, and Redirect do not have such output + * In case of NS, NA and Redirect, we end-up here after calling + * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output(). + * RS and RA do not have such output * routines. They are handled instead by rtadvd and rtsol daemons. * * if_output() routines together with previous chaining will be called @@ -1949,7 +1951,6 @@ NULL)); } error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, NULL); - return (error); bad: @@ -2090,11 +2091,9 @@ IF_AFDATA_LOCK(ifp); ln = lla_lookup(LLTABLE6(ifp), 0, dst); IF_AFDATA_UNLOCK(ifp); - /* ToFix: ln == NULL! lla_lookup -> generic link layer lookup func. */ if ((ln == NULL) || !(ln->la_flags & LLE_VALID)) { - if (ln != NULL) { + if (ln != NULL) LLE_RUNLOCK(ln); - } /* this could happen, if we could not allocate memory */ m_freem(m); return (1); ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. *