Date: Tue, 16 Dec 2008 02:33:53 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r186159 - head/sys/netinet6 Message-ID: <200812160233.mBG2Xr00023875@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Dec 16 02:33:53 2008 New Revision: 186159 URL: http://svn.freebsd.org/changeset/base/186159 Log: advance tail pointer in nd6_output_lle and check lla_output return against NULL Modified: head/sys/netinet6/nd6.c Modified: head/sys/netinet6/nd6.c ============================================================================== --- head/sys/netinet6/nd6.c Tue Dec 16 02:30:42 2008 (r186158) +++ head/sys/netinet6/nd6.c Tue Dec 16 02:33:53 2008 (r186159) @@ -1407,7 +1407,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru int newstate = 0; uint16_t router = 0; struct sockaddr_in6 sin6; - struct mbuf *chain = NULL; + struct mbuf *tail = NULL, *chain = NULL; int static_route = 0; IF_AFDATA_UNLOCK_ASSERT(ifp); @@ -1526,7 +1526,9 @@ nd6_cache_lladdr(struct ifnet *ifp, stru * just set the 2nd argument as the * 1st one. */ - nd6_output_lle(ifp, ifp, m_hold, L3_ADDR_SIN6(ln), NULL, ln, &chain); + nd6_output_lle(ifp, ifp, m_hold, L3_ADDR_SIN6(ln), NULL, ln, &tail); + if ((tail != NULL) && chain == (NULL)) + chain = tail; } if (chain) memcpy(&sin6, L3_ADDR_SIN6(ln), sizeof(sin6)); @@ -1889,8 +1891,10 @@ nd6_output_lle(struct ifnet *ifp, struct if (lle != NULL) { if (*tail == NULL) *tail = m; - else + else { (*tail)->m_nextpkt = m; + *tail = m; + } return (error); } if ((ifp->if_flags & IFF_LOOPBACK) != 0) { @@ -2037,7 +2041,7 @@ nd6_storelladdr(struct ifnet *ifp, struc ln = lla_lookup(LLTABLE6(ifp), 0, dst); IF_AFDATA_UNLOCK(ifp); if ((ln == NULL) || !(ln->la_flags & LLE_VALID)) { - if (ln) + if (ln != NULL) LLE_RUNLOCK(ln); /* this could happen, if we could not allocate memory */ m_freem(m);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812160233.mBG2Xr00023875>